Upgrade to rails 4.0.1
Remove version for now
Upgrade to capistrano 3
Upgrade whenever
Fix whenever for capistrano 3
Upgrade remaining gems excluding testing gems
Merge branch 'master' into statemachine

Conflicts:
	Gemfile.lock