Initial add user_messages
Merge branch 'dev' of github.com:GeoNode/geonode into messages-clean

Conflicts:
	geonode/settings.py
	geonode/urls.py
Merge branch 'dev' of github.com:GeoNode/geonode into messages-clean
Merge branch 'dev' of github.com:GeoNode/geonode into messages-clean

Conflicts:
	geonode/urls.py
Add user_messages to setup.py
Merge branch 'dev' of github.com:GeoNode/geonode into messages-clean
Disable the messages icon (for now, while things are disabled by default)
Merge branch 'dev' of github.com:GeoNode/geonode into messages-clean
Squashed commit of js cleanup and separation work by iwillig and mpriour
Remove depreciated template files added back by last commit
Correct regression in the updatelayers command
Merge branch 'jscleanMerge' of https://github.com/iwillig/geonode into jsclean

Conflicts:
	geonode/layers/management/commands/updatelayers.py
	geonode/layers/models.py
	geonode/layers/templates/layers/layer_search.html
	geonode/maps/templates/maps/map_search.html
	geonode/people/templates/people/profile_detail.html
	geonode/static/css/site.css
	geonode/static/geonode/css/base.css
	geonode/static/geonode/img/favicon.ico
	geonode/static/img/logo-bg.png
	geonode/static/js/utils.js
	geonode/templates/base.html
	geonode/urls.py
Fix python and template imports/includes
site_base.html points to base.html to work correctly with downstream projects
Almost there
More
still going
Merge branch 'dev' of github.com:GeoNode/geonode into jsclean
add loadmore.js'
Change path in test.js