Merge branch 'master' of https://git.lesprojekt.cz/luccerny/senslog1.git

Conflicts:
	src/main/java/cz/hsrs/servlet/security/ControllerServlet.java