a
Merge branch 'master' of https://github.com/osmman/JEE

Conflicts:
	src/main/java/cz/cvut/fel/jee/model/User.java
	src/main/java/cz/cvut/fel/jee/security/Authenticator.java
Vytvoreni autorizace a autentizace