Changed the way JSON is built
Merge branch 'master' of https://github.com/TStand90/mobile_on_rails

Conflicts:
	website/app/controllers/rest_controller.rb