broken commit
Merge branch 'master' of https://github.com/jonykalavera/django-sgtk

Conflicts:
	example/django_sgtk/api.py