Merge branch 'kml' into rogue
Merge branch 'gsr' into rogue
Merge branch 'master' into rogue
Merge branch 'gsr' into rogue
Merge branch 'kml' into rogue
Merge branch 'kml' into rogue

Conflicts:
	importer/src/main/java/org/opengeo/data/importer/Importer.java
make JsonSchemaTest test abstract
Merge remote-tracking branch 'origin/gsr' into rogue

Conflicts:
	importer/src/main/java/org/opengeo/data/importer/Importer.java
Add support for raster layers