Add django-rest-framework
Update django-rest-framework implementation.
Fix merge conflicts