Merge pull request #95 from Doha2012/master

Change encoding
Merge pull request #96 from Doha2012/master

Remove invalid characters
cleanup work in apache fop
Remove duplicate table of contents