lll
Merge branch 'master' of github.com:ilirlazaj07/JSF

Conflicts:
	src/main/java/navigation/UserData.java