Reverted 59d0a0387d907260ef8f91bbbca618831abd75a3 and fixed the tests
Merge pull request #1800 from tomchristie/version-3.0

Version 3.0
Add note about 3.0 being merged to master
Added NON_FIELD_ERRORS_KEY to serializer docs. Closes #1971.
Add docs on Meta inheritance. Closes #1926.
Add notes re view-level and instance-level permissions checks. Closes #1819.
Tweaks to validation notes
Call out 'get_value' and 'get_attribute'
Fix typo

That's all.
Merge pull request #2015 from tdavis/patch-1

Fix typo
Updated book link in HATEOAS page

Per http://www.crummy.com/2013/10/03/0 , the new book is *RESTful Web APIs* and the old book, *RESTful Web Services*, is obsolete.
add glyphicons font files
Merge pull request #2022 from brainwane/patch-1

Updated book link in HATEOAS page
Merge pull request #2024 from defrex/master

Add Glyphicons font files to solve collectstatic issue
Support None if initial part of dotted lookup returns None. Closes #1223.
Fix failing copy of fields when RegexValidator is used. Closes #1954.
Stronger calling out of 'DjangoObjectPermissionsFilter'. Closes #1934.
Copy accepted_renderer and accepted_media_type when cloing a request. Closes #1950.
Add docs on request.accepted_renderer and .accepted_media_type
Minor cleanup