Merge branch 'master' of https://github.com/28msec/nolap-report-editor into recompile-all

Conflicts:
	app/report/taxonomy/taxonomy-page.js
	tests/e2e/report-scenario.js
Merge branch 'recompile-all' of https://github.com/28msec/nolap-report-editor into recompile-all

Conflicts:
	app/report/taxonomy/taxonomy-page.js
	tests/e2e/report-scenario.js