merged Config.java; added Landcare specific files to landcare branch
merged changes with master and corrected Config.java
ensured Config.java is the same in both repos
Merge branch 'master' into landcare
added some debug help files and yaml config files for Landcare
merged landcare with master and resolved conflicts in samples/spec.json using remote for all
added test curl data for oe with legend
fixed issue 24 by not using DI for MapPrinter object
made comments on DI for MapPrinter more obvious
merged files from fix for issue 24
merged spring config .xml
builds with landcare customizations
yaml: changed configuration for legends to allow multi column legend
added script for easier debugging with Jetty
merged from upstream
got fresh copy from master repo
comments in build file for possible jetty configs; script for easier debugging
debugJetty from master repo
Merge branch 'landcare' of github.com:geekdenz/mapfish-print into landcare
legendsblock: possible inline = true and column max height