Changes to dashboard.html and splashpage controller
Merge branch 'master' of https://github.com/pemami4911/Osprey

Conflicts:
	osprey-dev2/public/js/controllers/dashboardMain.js

merging