Merge branch 'release/0.2.0' into develop
Fix for browserify-shim
Increase app version
Merge branch 'release/0.2.1'