Ruby 2.1.1
Fix capistrano config
Add upgrade task to capistrano
Fix capistrano upgrade task
Ruby 2.1.2
Rails 4.0.5
Merge branch 'master' of https://github.com/francocatena/cocts into bootstrap3

Conflicts:
	Gemfile.lock
Merge branch 'bootstrap3' of https://github.com/francocatena/cocts into bootstrap3