Merge branch 'release/v0.0.1-1s' into develop
backing out problem code
Upgraded Angular
Ran Grunt
Merge zip binary