w
merge
fix map bug
Merge branch 'master' of https://github.com/qianshui/qianshui.git

Conflicts:
	Client/WebRoot/app/util/Config.js
	Client/WebRoot/app/util/DataApi.js
	Client/WebRoot/app/view/OneIndustryPanel.js
	SourceCode/Server/Service/WebRoot/WEB-INF/classes/ServiceBus/MapService.class
	SourceCode/Server/Service/src/ServiceBus/MapService.java