Modal Update
Merge branch 'master' of https://github.com/monikajakober/SPINS

Conflicts:
	.project
	js/controllers/ReportCtl-ck.js
	js/controllers/ReportCtl.js
	views/Launchpad.html