Merge branch 'release-0.2' into develop
Core update
Merge branch 'release-0.2' of github.com:shumer/NG-new into release-0.2
Merge branch 'develop' of github.com:shumer/NG-new into develop
Merge branch 'release-0.2' into develop