indentation only
Fix Activity layout
Some style in Activity Feed page
Fix Activity Layout
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
Add thumbs and style to activity templates
Add thumbs in profile resources
Merge pull request #1296 from ppasq/templates

Add thumbs in profile page #1268 and in activity feed #1264
make social optional
Merge pull request #1297 from calvinmetcalf/optional-social

make social optional. Thanks @calvinmetcalf
Document the SOCIAL_BUTTONS setting.
This fixes #1301.
Merge pull request #1302 from capooti/issue-1301

This fixes #1301.
Fix ALLOWED_DOCUMENT_TYPES typo in the documentation.
Added some more popular file extensions to ALLOWED_DOCUMENT_TYPES.
add missing import in helpers for remove-deleted option
Merge branch 'master' of https://github.com/GeoNode/geonode
doUpload now returns false so the page does not scroll upwards when Upload is clicked
Merge pull request #1304 from batje/patch-1

doUpload now returns false so the page does not scroll upwards when button is clicked