Merge branch 'develop'
adding new html
Merge branch 'master' into develop