Merge branch 'hotfix/structure' into develop
Merge branch 'hotfix/cordova-index' into develop
Merge branch 'develop'