Append timestamp to geoserver package version
Use geonode version rather than geoserver version
Merge branch 'master' of github.com:GeoNode/geonode into dev
Merge branch 'dev' of github.com:GeoNode/geonode into dev