Initial add of geonode.groups
Add geonode.groups to settings
Fixup to be squashed
Some minor tweaks in the templates (to be squashed)
Dont send mail directly from groups/models.py (use notifications)
Merge branch 'dev' of github.com:GeoNode/geonode into groups-clean

Conflicts:
	geonode/settings.py
	setup.py
Merge branch 'dev' of https://github.com/GeoNode/geonode into groups-clean

Conflicts:
	geonode/settings.py
	geonode/templates/base_geonode.html
	setup.py
Add Groups to header in base.html
Manual port of group security PR from @makinacorpus (uses geonode.auth.models.group)
Fix block naming
Partially or completely disable some security tests for now
Remove Ext from group_members.html
Fix whitespace issue in setup.py
Merge branch 'master' of github.com:GeoNode/geonode into groups-clean

Conflicts:
	geonode/layers/tests.py
	geonode/layers/utils.py
	geonode/layers/views.py
	geonode/security/admin.py
	geonode/security/auth.py
	geonode/settings.py
	geonode/views.py
	setup.py
comment out requests for now
use set_object_permissions
use quotes around url tags for django 1.5
Merge branch 'master' of github.com:jj0hns0n/geonode into groups-clean

Conflicts:
	geonode/layers/tests.py
Merge branch 'groups-clean' of github.com:jj0hns0n/geonode into 2.1

Conflicts:
	geonode/layers/tests.py
	geonode/layers/utils.py
	geonode/security/tests.py
	setup.py