Can diff new files
Cleanup
Merge branch 'diff'

Conflicts:
	static/assets/js/codebrowser-min.js
Merge branch 'master' into timeline

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