no message
Merge branch 'master' of https://github.com/shalastra/jakatomelodia

Conflicts:
	Client/src/client/controllers/LoginController.java