minor
Merge branch 'master' of http://github.com/benjaminjnoack/simian

Conflicts:
	client/app/controllers/project/projectCtrl.js