restore html injection
Merge branch 'dev'