fixed html5
Merge branch 'develop'