Updating grunt build
Updated build
Merge branch 'release/v0.0.1-1p' into develop
Switching to $http from $resource