Prevent re-render while rendering
Merge branch 'master' of github.com:codebrowser/web-client

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