#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'
Update docs
Fix implementation
Merge with latest master
Tweaks
Tweak resource docs
fix function names and dotted lookups for use in PrimaryKeyRelatedField.field_to_native (they work in RelatedField.field_to_native already)
Merge branch 'master' into resources-routers
Remove erronous pre_save
Added tests for issue 747 in serializer.py
Forcing translations of lazy translatable strings in Field to_native method
Minor tweak
Note on using curl with token auth