fix delivery date display [14143422]
remove unused field from factory
fix gemfile
trying to fix best in place again
remove unneeded condition
fix specs
Merge branch 'master' of https://github.com/catarse/catarse into fix_deliver

Conflicts:
	app/models/project.rb
	spec/models/project_spec.rb
Merge pull request #838 from adrianob/fix_deliver

Fix deliver