Various fixes, hooked up data to enrol metadata
Merge branch 'master' of https://github.com/UQ-UQx/dashboard_js

Conflicts:
	app/visualisations/enrolmentmap/controller.js