From rails-api to a standard RoR application
Merge branch 'standard-rails' into development