Added dashboard
Merge branch 'master' of https://github.com/justinphillipuy/life-soundtrack

Conflicts:
	life-soundtrack/src/app/app.js
	life-soundtrack/src/app/home/home.js
	life-soundtrack/src/app/home/home.tpl.html
	life-soundtrack/src/index.html
	life-soundtrack/www/index.html
	life-soundtrack/www/src/app/app.js
	life-soundtrack/www/src/app/home/home.js
	life-soundtrack/www/templates-app.js