Correction
Merge branch 'feature/tastypie' into develop
Merge branch 'feature/REST' into develop
Correction