#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
Added tabs between object form and generic content form on PUT/PATCH form

Some extra behaviour to `BrowsableAPIRenderer` to handle PATCH form.
Added PATCH button on generic content PUT form.
Tabs between object form and generic content form on PUT/PATCH form wich are
both allways visible now.

Fix #570
Refs #591
Added tests for PATCH form in the Browsable API
POST form using new form.html template
Added tabs between object form and generic content form on POST form
Minimal forms appearance improvements
Merge branch 'browsable_api_patch' of https://github.com/wronglink/django-rest-framework into generic-form-input
Failing test case for #669