Fix spacing on client/server slide
Merge branch 'master' into gh-pages