Updated messages
Fixed translation problem in upload templates
Merge branch 'master' of github.com:GeoNode/geonode
don’t delete the resource but the store recursively
apply a patch to helpers
Merge pull request #1287 from simod/issue-1284

patch to gs helpers as a workaround to a possible gs bug
Merge branch 'master' of github.com:GeoNode/geonode
Merge branch 'master' of https://github.com/GeoNode/geonode into templates

# By Ariel Nunez (2) and Simone Dalmasso (2)
# Via Ariel Nunez (2) and others
* 'master' of https://github.com/GeoNode/geonode:
  apply a patch to helpers
  don’t delete the resource but the store recursively
  Fixed translation problem in upload templates
  Updated messages