dashboard mock
Merge branch 'master' of github.com:elpassion/flatmate

Conflicts:
	app/views/home/index.html.slim