refactoring
Merge branch 'report-editor' of https://github.com/28msec/nolap-report-editor into formula-editor

Conflicts:
	dist/nolap-report-editor.js
	src/editor.js