Merging OpenGeo Client SDK 3.0.2