project show, edit, delete modified
error fixed
Merge commit 'ed34064776f44ab1981cdd1b0cb95cc3f5765574' into develop

Conflicts:
	app/controllers/projects_controller.rb