#467 Added label and help_text to Field
#467 Added unit test
Fixed screwed formatting
Moved ctor test to separate unit test
Moved smart_unicode to Field ctor, to mimic Django Forms behavior.
Merge remote-tracking branch 'tom/master'

Conflicts:
	rest_framework/serializers.py
	rest_framework/tests/serializer.py
Merge remote-tracking branch 'tom/master'

Conflicts:
	rest_framework/tests/serializer.py
Merge remote-tracking branch 'upstream/master'
fix function names and dotted lookups for use in PrimaryKeyRelatedField.field_to_native (they work in RelatedField.field_to_native already)
Added tests for issue 747 in serializer.py
Forcing translations of lazy translatable strings in Field to_native method
Allow for missing non-required nested objects.

Serializer fields which are themselves serializers should not be required.
Specifically, if a nested object is set to "required=False", it should be
possible to serialize the main object and have the sub-object set to None/null.
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
Merge branch 'mikee2185-master' into mjtorn-master

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

Fixed all the conflicts.
Use smart_text() instead of nonexistant smart_unicode()