Resolved merge conflicts in mobile API
Fixed error in API controller.
Merge branch 'master' of heroku.com:adresdmes