typo
merge conflict fix

Conflicts:
	assets/src/app/community/index.tpl.html