Edited index.htm in dev branch
Merge from master