Reworking the merger
Merge branch 'master' of https://github.com/schlomm/OSMPubGuide-Backend

Conflicts:
	OSMPubGuide-WS/test/de/ifgi/ohbpgiosm/EventDBTest.java