TVB Ansicht aktualisiert
Merge branch 'master' of https://github.com/swe2013hotel2/grashopper

Conflicts:
	workspaceJSP2/Grasshopper/WebContent/MyAccount.jsp
	workspaceJSP2/Grasshopper/src/Servlet/MyAccount.java