Use item_id and item_type a bit more
Various settings changes for hub
Merge branch 'master' of https://github.com/oriel-hub/api
Merge branch 'master' of https://github.com/oriel-hub/api
Merge branch 'master' of https://github.com/oriel-hub/api

Conflicts:
	django/idsapi/settings.py
Merge branch 'master' of /var/django/idsapi_new/dev