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
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
Merge branch 'master' of github.com:GeoNode/geonode into search_work
Merge branch 'tastyfast' of https://github.com/simod/geonode into search_work

Conflicts:
	geonode/api/resourcebase_api.py
Remove oid filter
try to fix it
Merge branch 'search_work' of https://github.com/jj0hns0n/geonode into jeff_search_work
make serialization to work