Fixed database update instructions
Added missing import in tutorial snippet
Merge pull request #2117 from LuRsT/patch-6

Added missing import in tutorial snippet
Merge pull request #2116 from LuRsT/patch-5

Fixed database update instructions
Lowercase HTML label tag. Refs #2121.
Merge branch 'master' of https://github.com/tomchristie/django-rest-framework
Style tweaks to login template.
Merge pull request #1 from tomchristie/master

Merge upstream