database url
appengine properties
Merge branch 'master' of https://github.com/fabianroeber/Raumplaner2

Conflicts:
	Raumplaner/src/itprojekt/raumplaner/server/db/DatabaseConnection.java
	Raumplaner/war/WEB-INF/appengine-web.xml