Merge branch 'master' into 'tutorial-4'

# Conflicts:
#   README.md
#   tutorial/settings.py
#   tutorial_4/functional_tests.py

tutorial_3/functional_tests.py

@@ -10,6 +10,7 @@ from selenium.webdriver.common.keys import Keys
 from selenium.common.exceptions import WebDriverException
 
 
+@unittest.skip("excluded")
 class Tutorial2FunctionalTest(LiveServerTestCase):
 
     def setUp(self):