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

Conflicts:
	book/formats/Epub2Generator.php
Merge pull request #29 from thrasibule/master

Make the code compatible with php-5.5