update r4917
Merge branch 'gh-pages' of https://github.com/imagedrive/spec into gh-pages

Conflicts:
	epub301-vocab-structure.xhtml
	index.xhtml