Merge branch 'release/0.5.2' into develop
Update version
Merge branch 'develop'
Merge branch 'master' into cordova