fix function names and dotted lookups for use in PrimaryKeyRelatedField.field_to_native (they work in RelatedField.field_to_native already)
Merge remote-tracking branch 'upstream/master'
Forms in Broseable API support dynamic serializers based on request method
Merge pull request #850 from tomchristie/dynamic-forms

Forms in Broseable API support dynamic serializers based on request method
Updated the dependencies version and added the ALLOWED_HOSTS for tests.
add tests for related field source for RelatedField and PrimaryKeyRelatedField. #694
add tests for related field source for HyperlinkedRelatedField. #694
serializers.Field respects ordering on dicts if it exists.  Closes #832
add tests for dotted lookup in RelatedField, PrimaryKeyRelatedField, and HyperlinkedRelatedField. #694
Merge pull request #694 from craigds/master

fix function names and dotted lookups for use in PrimaryKeyRelatedField
A model's field is required if is null or blank
Merge pull request #851 from linovia/master

Updated the dependencies version and added the ALLOWED_HOSTS for tests.
Adding `BLANK_CHOICE_DASH` as a choice if the model's field isn't required
Merge branch 'master' into 725-blank-choice-dash

Conflicts:
	rest_framework/tests/fields.py
Moved test model into closer to the testcase
Merge pull request #853 from pyriku/725-blank-choice-dash

Adds BLANK_CHOICE_DASH as a choice item