Merge branch 'master' of ssh://rtime.felk.cvut.cz/rpp-test-sw

Conflicts:
	.cproject
	rpp-lib

diff --cc .cproject
Simple merge

diff --cc rpp-lib
index 70e3a9f22d1d427b0fa0544aa358f69df06919be,8f22b0c5d7f59a68867ec9a8d38d27cb8578259f..c5eb1843dec801a3da118585f2e5bbb921174c63
--- 1/rpp-lib
--- 2/rpp-lib
+++ b/rpp-lib
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit 70e3a9f22d1d427b0fa0544aa358f69df06919be
 -Subproject commit 8f22b0c5d7f59a68867ec9a8d38d27cb8578259f
++Subproject commit c5eb1843dec801a3da118585f2e5bbb921174c63