Add HTML in index.html
Merge branch feature_dev into dev