提交酒店位置资源文件
Merge branch 'maple'

Conflicts:
	guoli/AndroidManifest.xml
	guoli/res/values/strings.xml
	guoli/src/com/guoli/hotel/activity/HotelDetailActivity.java