Merge branch 'release/v0.0.1-2h' into develop
Changing $http to $resource for getting token
Removing any redundancies in retrieving tokens by appKeys
bumped version and ran grunt
weird stuff
Resolving conflict

Looks strange in changes but committing anyway