Merge branch 'master' into gh-pages
Added new WebSocket slide.
Merge branch 'gh-pages'