More bootstrapping
Bug fixes
Merge branch 'cellfire' of https://github.com/28msec/nolap-report-editor into cellfire-d

Conflicts:
	Gruntfile.js
	app/report/config.js