various cleanup
Merge branch 'master' of https://github.com/IDPF/edupub

Conflicts:
	samples/structure-sample-01/EPUB/xhtml/nav.xhtml