Minor changes
Merge branch 'master' of https://github.com/UQ-UQx/dashboard_js

Conflicts:
	app/scripts/controllers/dashboard.js
	app/views/dashboard.html
	app/visualisations/discussion_forum_data/controller.js