Merge branch 'comment-module' into highlighted-comments

Conflicts:
	dev-build/conf/routes
hook in highlighted comments via lazy loaded js