make code compatible to php-5.5
Merge branch 'mybranch'

Conflicts:
	book/formats/Epub2Generator.php