asdfa
Merge https://github.com/klooff/django-tastypie