Conflicts:
	rest_framework/fields.py
	rest_framework/serializers.py
	rest_framework/tests/models.py
	rest_framework/tests/serializer.py

Fixed all the conflicts.

Forms in Broseable API support dynamic serializers based on request method

Fix typo + grammar in viewsets docs

HyperlinkedIdentityField uses `lookup_field` kwarg.

According to the [Serializers API Guide][1], `HyperlinkedIdentityField`
takes `lookup_field` as a kwarg like the other related fields and the
generic views. However, this was not actually implemented.

[1]: http://django-rest-framework.org/api-guide/serializers.html#hyperlinkedmodelserializer

Small typo in the ViewSet example.

Remove trailing unmatched </div> in login_base.html template. Reformat i...

Remove trailing unmatched </div> in login_base.html template. Reformat indentation and label all closing tags for consistency.

added support for multiple @action and @link decorators on a viewset, along with a router testcase illustrating the failure against the master code base