Move split logic to editor view
Merge branch 'master' into file-navigation

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