查询酒店时增加使用酒店名称的模糊搜索
Merge branch 'master' of https://github.com/yunfeng/schotel

Conflicts:
	qms-b2c/src/main/java/cn/buk/api/action/CtripHotelAction.java
	qms-b2c/src/main/java/cn/buk/api/service/CtripHotelServiceImpl.java
	qms-b2c/src/main/java/cn/buk/qms/task/RatePlanTask.java