Merge origin/master

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