1st development
Merge branch 'master' into dashboard

Conflicts:
	app/scripts/controllers/DashCtrl.js
	app/styles/dash.css
	app/views/dashboard.html