Merge pull request #506 from simod/map_resourcebase

Make maps inherit from ResourceBase
Added check for self.uuid being None, references #506
Wire up social icons in nav bar, references #507
Update geonode/maps/models.py

fix formatting
Merge branch 'dev' of github.com:GeoNode/geonode into dev
Merge branch 'social' of github.com:jj0hns0n/geonode into dev

Conflicts:
	geonode/settings.py
	setup.py
Fix style deletion
Fix duplicate settings entries and organize them
Merge branch 'dev' of github.com:GeoNode/geonode into messages-clean

Conflicts:
	geonode/settings.py
	geonode/urls.py
Add django-profiles==0.2 back?? (why do we have both django-profiles and geonode-profiles)
Merge branch 'dev' of github.com:GeoNode/geonode into messages-clean
Fix syntax error in smoke tests. How is travis passing this?, must not be running the smoke tests
Fix another syntax error in smoke tests.
One more
Rename geonode/signals.py to geonode/social_signals.py
Refactor of profiles using django-user-accounts and geonode.people
Fix block naming in avatar/add.html template
Add layer style link in Edit Layer Dropdown
further work
leave everything disabled