Restored the notification app and adding some more notification types
Added support for i18n
show categories if they have records
Merge branch 'master' of https://github.com/GeoNode/geonode
Merge pull request #1811 from capooti/restore-notification

Restored the notification app and adding some more notification types
Updated changelog for version 2.4b4
Update ec2.py
added update button to top.  Updated page headers for documents and maps
Merge pull request #1839 from state-hiu/metadata_layout_1

Metadata Layout Fixes - 1
Work on Responsive header
Merge branch 'master' of https://github.com/GeoNode/geonode into fixer

# By state-hiu (4) and others
# Via Simone Dalmasso (2) and others
* 'master' of https://github.com/GeoNode/geonode:
  added update button to top.  Updated page headers for documents and maps
  Update ec2.py
  Updated changelog for version 2.4b4
  show categories if they have records
  Fixes #1835
  whitespace fixes
  fixes #1830
  Added support for i18n
  Updated changelog for version 2.4b3
  Restored the notification app and adding some more notification types

Conflicts:
	geonode/templates/base.html
fix the document upload link to resource