³¢ÊÔעÈëjax:client
Merge branch 'webservice' of github.com:AdoHe/AdsDeliver into webservice

Conflicts:
	AdsDeliver_Server/WebRoot/WEB-INF/applicationContext.xml