Merge branch 'develop' into testing
Merge branch 'develop' into testing
index.html~ removed