merged
Merge branch 'master' of https://github.com/hhagmans/Ticket-Boys.git

Conflicts:
	src/main/java/de/fh_dortmund/ticket_system/authentication/Authentication.java
	src/main/webapp/login.xhtml