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

Conflicts:
	app/controllers/ProjectController.php