Add conceptmap directive
Merge remote-tracking branch 'origin/report-editor' into formula-editor

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