Correct problems with highlight.js, add it to client
Merge branch 'master' into gh-pages
New build for deployment