Signed-off-by: Stefanie Lehmann <stefanie.lehmann-berlin@web.de>
Merge remote-tracking branch 'origin/master'

Conflicts:
	Hoteldaten_14-08-07.sql
Merge branch 'master' of https://github.com/StefLB/HotelBudapest