override tastypie to make it fast enough
fix the base tags
remove unused dehydrate fields
better category and keywords count
Merge pull request #1532 from mbertrand/services_gn

Services as core module
fixes issue 799-windows upload file locking
Merge pull request #1536 from nathanhilbert/windowsupload-799

Windows upload 799
add denormalized fields for apis
fix api for item detail
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