Merge branch 'release/0.6.0' into develop
Disable pushState for Cordova
Merge branch 'develop'