Merge branch 'test_django-rest-framework2' into api_user_detail_view
Fix token request form.
Merge branch 'api_user_detail_view' into api_filtering