Merge branch 'master' of https://github.com/yangyachao/YYC

Conflicts:
	ALLNetWeb/ClientBin/BSAP.Main.xap
	ALLNetWeb/ClientBin/FieldsInfo/FieldInfoHomePage.xml
	ALLNetWeb/ClientBin/FieldsInfo/FieldInfoMSTraffic.xml
	ALLNetWeb/ClientBin/MapConfig.xml
	ALLNetWeb/ClientBin/Menu.xml
	ALLNetWeb/ClientBin/QueryConfig.xml
	ALLNetWeb/bin/BSAP.Web.dll
	ALLNetWeb/bin/BSAP.Web.pdb
	webservice/webservice.v11.suo
	webservice/webservice/config/10_W.xml
	webservice/webservice/config/10_W.xml.bak
Merge branch 'master' of https://github.com/yangyachao/YYC

Conflicts:
	ALLNetWeb/ClientBin/FieldsInfo/FieldInfoHomePage.xml
	ALLNetWeb/ClientBin/FieldsInfo/FieldInfoMSTraffic.xml