Merge branch 'master' of https://github.com/patricktuin/hotelbieze2

* 'master' of https://github.com/patricktuin/hotelbieze2:
  changes
  changes

Conflicts:
	.idea/workspace.xml
changes