#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 support for multiple @action and @link decorators on a viewset, along with a router testcase illustrating the failure against the master code base
fix test case to work with Python 3 and make it more explicit
Remove trailing unmatched </div> in login_base.html template. Reformat indentation and label all closing tags for consistency.
Updated release notes
Fix Django 1.3 compat with routers
SearchFilter may be comma and/or whitespace seperated
More docs on SearchFilter
Rename filter tests
Added OrderingFilter