c
c
c
c
Merge branch 'master' of https://github.com/xinzhubang/weixin

Conflicts:
	src/main/webapp/js/community.min.js