update faceting
simplify faceting
add faceting on categories and keywords
use category faceting
Merge branch 'api' of https://github.com/simod/geonode into api-search

Conflicts:
	geonode/api/models.py

support for type in faceting