dashboard
Merge branch 'master' of https://github.com/janvdt/SparkCoin

Conflicts:
	app/views/projects/show.blade.php