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
Add proxy url for geoserver sldService module; add additional gxp files for classifier
Merge pull request #1508 from mbertrand/classifier_gn

Add proxy and gxp files for layer style classifier
Removed paver static from paver setup but added it to the travis.yml so it is tested
Merge branch 'master' of github.com:GeoNode/geonode
Updated setup.py to use django-geoexplorer 4.0.4
Let paver static install node in travis
grunt-cli was missing from package.json