Code style
Merge branch 'master' into tags

Conflicts:
	static/assets/js/codebrowser-min.js
	static/assets/js/codebrowser-templates-min.js