More tastypie interactions
Merge remote-tracking branch 'origin/master'