fix
Merge branch 'develop' into feature/highlightmaker

Conflicts:
	src/main/php/smarty/frontpage.tpl
Merge branch 'feature/highlightmaker' into develop