垃圾微信
Merge branch 'master' of
https://github.com/XiaoEDaiKuan/xiao-e-dai-kuan-site-app.git

Conflicts:
	src/main/webapp/WEB-INF/inc/globalFooterMenu.jsp