Merge branch 'feature/control_test' into feature/react_test

# Conflicts:
#	.gitignore
#	main/tests.py

.gitignore

@@ -127,7 +127,6 @@ ENV/
 env.bak/
 venv.bak/
 pythonenv*
-windows_venv
 
 # Spyder project settings
 .spyderproject
@@ -377,5 +376,5 @@ $RECYCLE.BIN/
 /static/main/js/control_page/node_modules
 /static/main/js/control_page/dist
 node_modules
-# End of https://www.toptal.com/developers/gitignore/api/django,pycharm+all,python,linux,macos,windows
 
+# End of https://www.toptal.com/developers/gitignore/api/django,pycharm+all,python,linux,macos,windows