Estimation Statut management  refs:#777
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	app/controllers/projects_controller.rb