Check in code restaurant and touristplace
Check in hotel
Commit hotel branch
Merge remote-tracking branch 'remotes/origin/hotel'

Conflicts:
	client/config.js
	client/main.js
	model/hotel/hotel.php
merge restaurant, hotel, touristplace and taxi branchs to master