Bug fix
Merge branch 'report-editor' of github.com:28msec/nolap-report-editor into report-editor