GeoServer

Upgrade GeoServer to GeoTools trunk (2.1.x)