Merge branch 'master' into develop
highlight.js version up to 8.2
Merge branch 'develop'