Initial work on porting MapSnapshot against master
more work on custom and featured urls
use looser matching in maps/urls.py
Lookup maps by custom url if the mapid is not a number
Use snapshot to lookup config if passed
Merge branch 'master' of github.com:GeoNode/geonode into map_snapshot_and_urls

Conflicts:
	geonode/maps/admin.py
	geonode/maps/views.py
Merge branch 'master' of github.com:GeoNode/geonode into map_snapshot_and_urls
Fix up permissions in geonode/maps/views.py
Fixup perms per new guardian stuff
Re-enable geoserver by default
Merge branch 'master' of github.com:GeoNode/geonode into map_snapshot_and_urls
Move encode/decode functions to utils and remove extraneous stuff?
Merge branch 'map_snapshot_and_urls' of https://github.com/jj0hns0n/geonode
revert to absolute url in resource base snippet
Merge pull request #1563 from jj0hns0n/map_snapshot_and_urls

Map snapshot and urls
Merge branch 'master' of https://github.com/GeoNode/geonode