Latest build
Code style
Merge branch 'master' into snapshot-navigation

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