Merge branch 'refs/heads/fix-fragments-in-speakernotes' into fragments-in-notes-server

Conflicts:
	js/reveal.min.js

Need to generate a new minified version afterwards.

diff --cc README.md
Simple merge

diff --cc js/reveal.js
Simple merge

diff --cc plugin/notes-server/client.js
Simple merge

diff --cc plugin/notes-server/index.js
Simple merge

diff --cc plugin/notes-server/notes.html
Simple merge