Rails 4.1 App
Solved conflicts