Verknüpfungen mit jsps
Merge branch 'master' of https://github.com/ehotel/ehotel.git

Conflicts:
	src/main/webapp/WEB-INF/spring/appServlet/servlet-context.xml
	src/main/webapp/WEB-INF/views/header_big.jsp