java syntax
Merge branch 'master' of https://github.com/Gruppe14/KIT-PSE

Conflicts:
	app/data_access/CreateDatabase.java
	app/data_access/WareHouseConfiger.java
facade singleton