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

Conflicts:
	build.gradle
Don't display scale as double