User more conforming to $resource
Merge branches 'master' and 'master' of https://github.com/ninjatronic/ngKinvey