enum editor
Merge branch 'dev' of github.com:lintubongarit/sulka into editors

Conflicts:
	src/main/webapp/resources/js/sulka.core.js
	src/main/webapp/resources/js/sulka.strings.js
fix some of the tests
Merge branch 'editors' into dev