Updates to directives and controllers
Merge branch 'master' of https://github.com/monikajakober/SPINS

Conflicts:
	js/controllers/LaunchpadController.js
	js/controllers/ReportCtl.js
	views/Launchpad.html
	views/Reports.html