More superoverlay tests, now working as they should
CSW plugin zip assembly configuration
fixing injectGraphic to fall back on existing properties of graphic, rather than setting to null
Merge pull request #260 from NielsCharlier/cswplugin

CSW plugin zip assembly configuration
fixing version numbers, #260
Hook up CSS artifact descriptor for extension packaging
Merge branch 'master' of github.com:geoserver/geoserver

Conflicts:
	src/community/kml2/src/main/java/org/geoserver/kml/KmlEncodingContext.java
	src/community/kml2/src/test/java/org/geoserver/kml/KMLReflectorTest.java
added easymock dependency
making icon service uri matching a bit more lax
[GEOS-5828] GWC - External Database issues (including security one)
[GEOS-5877] Replace old KML module with the new KML2 one
Merge pull request #265 from aaime/gsip98

[GEOS-5877] Replace old KML module with the new KML2 one