Prototyp 2
Merge branch 'master' of https://github.com/swe2013hotel2/grashopper

Conflicts:
	workspaceJSP2/Grasshopper/src/Servlet/TVBAnsicht.java
	workspaceJSP2/Grasshopper/src/Servlet/TVBRegistrierung.java
	workspaceJSP2/Grasshopper/src/Servlet/TVBStatistik.java