Logging
Merge branch 'master' into fixing_threads

Conflicts:
	src/cz/mgn/collabcanvas/Main.java
	src/cz/mgn/collabcanvas/canvas/panel/justcanvas/MainImage.java