Merge both files to index.html
Merge branch 'release-1' into develop