2.3.x

Merged in all of ischneider's commits from https://github.com/MapStory/geoserver-geonode-ext/tree/mapstory-2.3.x