Merge branch 'develop' into refactor/set-followups-map-and-datagrid-above-those-of-nodone

Conflicts:
	app/scripts/services/data-loader.js