initial work towards permissions on resourcebase
make upload working
Merge branch 'master' of https://github.com/GeoNode/geonode into guardian

Conflicts:
	geonode/templates/_permissions_form.html
Merge branch 'master' of https://github.com/GeoNode/geonode into guardian
make layers tests to pass
fix maps, docs and api tests
some fixes and dropped the generic role mappings tables
add guardian to setup
test default non polymorphic
add polymorphic queryset to manager
Merge branch 'master' of https://github.com/simod/geonode into guardian

Conflicts:
	geonode/base/templates/base/resourcebase_info_panel.html
	geonode/documents/templates/documents/document_detail.html
	geonode/layers/templates/layers/layer_detail.html
	geonode/maps/templates/maps/map_detail.html
	setup.py
Merge branch 'master' of https://github.com/GeoNode/geonode into guardian
Merge branch 'master' of https://github.com/GeoNode/geonode into guardian
fix categories filter
Fix #1472.  ACLS list is incorrect for layers assigned to a public group.
Run the tests in the geoserver task.
Peg geoserver.war to the 2.4-SNAPSHOT

Uncomment these lines again once 2.5-SNAPHOT works.
Disabled test_register_csw
Disabled test_register_csw

(this time by commenting it out)
Enabled latest geoserver to 2.5