List any content, not just categories
Merge branch 'master' of github.com:wheelcms/wheelcms_categories

Conflicts:
	wheelcms_categories/models.py