全局常量和初始化配置
Merge branch 'master' of git@github.com:ArvinCao/Mobile_push.git

Conflicts:
	push/WebRoot/WEB-INF/web.xml