Refactoring
Merge branch 'diff' of github.com:codebrowser/web-client into diff

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