merge add/edit html
Merge branch 'master' into feature/cp-improvements