Merge branch 'release/v0.0.1-2g' into develop
Cleaned up and removed 'junk'
Changing this back to $resource usage
bumped version and ran grunt
handle zip conflict