Fix for #92 and #113
Merge branch 'master' of git://github.com/opengeogroep/mapfish-print into itext-upgrade
Fixes after merge errors