Merge branch 'hotfix/code-highlighting-readme'
Switch to code highlighting supported by both github and bitbucket
Merge branch 'hotfix/github-code-highlighting' into develop