#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
Added 'Customizing the generic views' section.  Closes #816
Tweak doc text slightly
Added GenericViewSet and docs tweaking
Tweak inheritance
Fix HyperlinkedModelSerializer not respecting lookup_fields
Fix minor code error in Generic Views documentation - missing `if` statement.
Merge pull request #818 from hamishcampbell/master

Very minor documentation code fix.
Added @hamishcampbell for docs fix #818. Thanks!
Docs tweaks