Fixed issue with OPF/XHTML files in the root dir of the EPUB container.
Merge branch 'master' into devel