Merge branch 'develop' into feature/registration

# Conflicts:
#	access_controller/urls.py
#	main/extra_func.py
#	main/forms.py
#	main/views.py

access_controller/settings.py

@@ -178,3 +178,8 @@ LOGGING = {
         }
     }
 }
+
+ZENDESK_ROLES = {
+    'engineer': 360005209000,
+    'light_agent': 360005208980,
+}

access_controller/urls.py

@@ -18,6 +18,10 @@ from django.contrib.auth.forms import AuthenticationForm
 from django.contrib.auth.views import LoginView
 from django.contrib.auth import views as auth_views
 from django.urls import path, include
+from access_controller import settings
+from access_controller.settings import DEBUG
+from main.views import main_page, profile_page, CustomRegistrationView, work_page, work_hand_over, work_become_engineer, AdminPageView
+
 from main.views import main_page, profile_page, CustomRegistrationView, CustomLoginView
 
 urlpatterns = [
@@ -27,8 +31,13 @@ urlpatterns = [
     path('accounts/register/', CustomRegistrationView.as_view(), name='registration'),
     path('accounts/login/', CustomLoginView.as_view(extra_context={}), name='login',),  # TODO add extra context
     path('accounts/', include('django.contrib.auth.urls')),
+    path('accounts/', include('django_registration.backends.one_step.urls')),
+    path('work/<int:id>', work_page, name="work"),
+    path('work/hand_over/', work_hand_over, name="work_hand_over"),
+    path('work/become_engineer/', work_become_engineer, name="work_become_engineer"),
     path('accounts/', include('django_registration.backends.activation.urls')),
     path('accounts/login/', include('django.contrib.auth.urls')),
+    path('control/', AdminPageView.as_view(), name='control')
     ]
 
 urlpatterns += [