temp
Merge branch 'ourcheng' of https://github.com/jiangbeng/ourcheng_v1 into ourcheng

Conflicts:
	detail-hotel.html