Loading screen
Merge branch 'master' of https://github.com/UQ-UQx/dashboard_js

Conflicts:
	app/scripts/directives/world/world.js
	app/visualisations/enrolmentmap/template.html