Update Rails to 4.1.1
Merge changes and regenerate gemfile.lock
Merge branch 'JuanitoFatas-patch/update-rails-to-4-1-1'