Merge branch 'master' into gh-pages

Conflicts:
	js/reveal.min.js