Usercontroller was modified
Merge branch 'master' of
git@github.com:csabaujvari/RendszerFejlesztes.git

Conflicts:
	src/hu/rf/constans/Constants.java