Merge branch 'develop' into feature/react_test

# Conflicts:
#	static/main/js/control_page/control.js

access_controller/urls.py

@@ -14,6 +14,7 @@ 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
@@ -36,8 +37,7 @@ urlpatterns = [
     path('accounts/', include('django_registration.backends.activation.urls')),
     path('control/', AdminPageView.as_view(), name='control'),
     path('statistic/', statistic_page, name='statistic'),
-    ]
-
+]
 
 # Django REST
 urlpatterns += [