User json completed.
Bug fix for user json.
Fixed by spec files renaming misspelled user_controller_spec.rb to users_controller_spec.rb
Merge branch 'master' into tools-list