Initial work on hooking up haystack
Hook up new search properly
Hook up the query properly
more work on search
Hook up paging
Merge branch 'master' of github.com:GeoNode/geonode into search_work
Merge branch 'master' of github.com:GeoNode/geonode into search_work
Work on faceting
Include facets in json response, remove metadata_xml and csw_anytext from output
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 search_work

Conflicts:
	geonode/api/resourcebase_api.py
	geonode/settings.py
	geonode/templates/base.html
Merge branch 'master' of github.com:GeoNode/geonode into search_work
Some fixup after changes to User and Group models
Reconnect autocomplete
Make haystack respect permissions
override tastypie to make it fast enough