Merge branch 'release/1.0'
cordova ignore
Merge branch 'hotfix/cordova_ignore' into develop