文件更名
Merge branch 'master' of https://github.com/Yunfeng/schotel

Conflicts:
	qms-b2c/src/main/java/cn/buk/api/service/CtripHotelServiceImpl.java