Merge branch 'gh-pages' of https://github.com/json-schema/json-schema into gh-pages-highlight-custom

Conflicts:
	example.html