Merge branch 'develop' into feature/react_test

# Conflicts:
#	main/templates/pages/adm_ruleset.html
#	static/main/js/control.js

access_controller/urls.py

@@ -14,7 +14,6 @@ Including another URLconf
     2. Add a URL to urlpatterns:  path('blog/', include('blog.urls'))
 """
 from django.contrib import admin
-from django.contrib.auth import views
 from django.urls import path, include
 
 from main.views import main_page, profile_page, CustomRegistrationView, CustomLoginView, registration_error
@@ -22,6 +21,7 @@ from main.views import work_page, work_hand_over, work_become_engineer, work_get
     AdminPageView, statistic_page
 from main.urls import router
 
+
 urlpatterns = [
     path('admin/', admin.site.urls, name='admin'),
     path('', main_page, name='index'),