Adding index.html for feature-1.0
Merge branch 'feature-1.0' into develop
Merge branch 'develop'