Updated messages
Fixed translation problem in upload templates
Merge branch 'master' of github.com:GeoNode/geonode
Fix Layer Replace template
Merge branch 'master' of https://github.com/GeoNode/geonode into templates

# By Simone Dalmasso (3) and others
# Via Ariel Núñez (3) and Simone Dalmasso (2)
* 'master' of https://github.com/GeoNode/geonode:
  add __init__.py file in the base commands folder
  add missing port in vagrant doc
  fix rating in detail pages for unauthenticated
  Add the document model to the actstream settings.
  #1276 replace pil with pillow
Merge pull request #1283 from ppasq/templates

Fix some CSS in Replace Layer template
Add icon placeholder in documents search list #1269
Merge branch 'master' of https://github.com/GeoNode/geonode into templates

# Via Simone Dalmasso
* 'master' of https://github.com/GeoNode/geonode:
Merge pull request #1285 from ppasq/templates

Add icon placeholder in documents search list #1269
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
add timeout configuration to handle long requests (#1279)