Fixing up content negotiation docs
Merge branch 'master' of https://github.com/tomchristie/django-rest-framework
Added @cyroxx for work on #978
Add note on ModelSerializer validation of both model fields and serializer fields. Refs #949
Add support for collection routes to SimpleRouter
Add docs for collection routes
Rework extra routes doc for better readability
Revert route name change and add key to Route object to identify different route types
Rename router collection test case
Changed collection_* decorators to list_*
Introduce DynamicDetailRoute and DynamicListRoute to distinguish between different route types