Removed the use of $resource and refactored it to use $http.  Made all calls to accept a call back
Merge remote-tracking branch 'origin/master'