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

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