silentwu commit
Merge branch 'master' of https://github.com/silentwu/coachTrip

Conflicts:
	bustou/sql/test.xml
	bustou/src/main/java/com/bustou/hotel/api/TongcApi.java
	bustou/src/main/java/com/bustou/hotel/utils/TongcBaseDataUtil.java