团购酒店提交
Merge branch 'master' of https://github.com/wenxiaochen/develop

Conflicts:
	newtest/playwan/app/util/Config.java
	newtest/playwan/cf/BrandType.txt
	newtest/playwan/cf/SignCode.txt
	newtest/playwan/cf/Url.properties
	newtest/playwan/cf/orgType.txt
Merge branch 'master' of https://git@github.com/wenxiaochen/develop.git
添加poi备份，大数据量poi发布功能，完善log信息