Update 1
Merge branch 'master' of https://github.com/Symantis/Symantis.org

Conflicts:
	assets/src/app/community/board/index.tpl.html
Merge branch 'master' of https://github.com/Symantis/Symantis.org

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