Merge branch 'develop' of https://github.com/bravecollective/forums into develop

Conflicts:
	brave/forums/template/thread.html