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
redirect on contribution edit when reward is sold out [14212922]
remove unnused methods and other random improvements
let's actually use this method
fixing project model spec for video_url validation
Merge pull request #842 from adrianob/redirect_on_sold_out

redirect on contribution edit when reward is sold out [14212922]
fixed typo in VideoHandler spec
Merge pull request #843 from adrianob/random_fixes

remove unnused methods and other random improvements
layout changes to make the tablet size work
layout changes to make the phone size work
Merge branch 'master' of github.com:catarse/catarse
Merge pull request #844 from pedromarins/project-page-responsive

Project page responsive
Merge branch 'bootstrap' of github.com:catarse/catarse into bootstrap