some changes
Merge branch 'master' of https://github.com/michaelleiser/phd

Conflicts:
	phd/src/main/java/org/bfh/phd/LoginController.java