修改酒店搜索界面
Merge branch 'master' of https://github.com/chengxd/Miutrip

Conflicts:
	MiuTrip/MiuTrip.xcodeproj/project.pbxproj