Hopefully bug fixed with not finding login.xhtml! User can now only
login after activation!
Test
Merge branch 'master' of https://github.com/vc-solution/cafepep.git

Conflicts:
	src/main/java/login/LoginController.java