Merge branch 'master' into enhancements

Conflicts:
	src/templates/Editor.template
	src/views/editor-view.js
	static/assets/js/codebrowser-min.js
	static/assets/js/codebrowser-templates-min.js
	static/assets/js/codebrowser-templates.js
	static/assets/js/codebrowser.js
Theme change affects whole HTML document - #22