tastypie tests
tastypie test
merge comit