Merge branch 'hotfix/hotfix-html5shim'
Merge branch 'develop'
- removed zip file