#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
add tests for OAuth authentication
add django-oauth-plus & oauth2 to installed apps in runtests settings.py
add OAuthAuthentication class
add django-oauth-plus & oauth2 to .travis.yml
add django-oauth-plus & oauth2 to optionals.txt
add OAuthAuthentication documentation stub
Add better date / datetime validation (pull 2)

addition to #631 with update to master + timefield support