Upgrade to Rails 4.0.2
Upgrade all gems
Merge branch 'master' into rails-3-2