header and login
Merge branch 'master' of https://github.com/ehotel/ehotel.git

Conflicts:
	src/main/webapp/WEB-INF/views/header_big_booking.jsp
	src/main/webapp/WEB-INF/views/login_user.jsp
	src/main/webapp/WEB-INF/views/registrieren.jsp