Merge branch 'sceditor' into sceditor-bootstrap

Conflicts:
	src/main/webapp/WEB-INF/js/app.js