upgrade to rails 4.1
fix merge conflicts
gemfile.lock