Removed a comma in the context description so as to ensure that it can be read properly
Merge branch 'ocorcho-gh-pages' into gh-pages

Conflicts:
	jsonld.html