Update Database
Solve: Merge branch 'master' of github.com:Bagception/BagceptionMasterControlService

Conflicts:
	src/de/uniulm/bagception/bagceptionmastercontrolserver/database/DatabaseTest.java