#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'
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()
ManyHyperlinkedRelatedField comes form rest_framework.relations now
Renderer uses form field's label and help, not attribute name
Turns out label and help_text are not always there
Move and rename LabelModelSerializer for further reuse
Change BasicModel.verbose_name

Isn't it nicer to test for a text which is different from
what the previous broken behavior was? Now we can really
tell it works!
Update FieldLabelTest to use new BasicModel.verbose_name
Two test cases for html rendering of API with labelized model
Merge branch 'master' into mjtorn-master

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

Fixed conflicts
Drop u'', it was used inconsistently and breaks for nothing with Python 3.2
Drop another case of u'', this time from #530 code