change json structure
Merge branch 'master' of heroku.com:city-app-rails
user json updates
rails changes
merge conflict
changed controller responses