Merge branch 'develop' into feature/react_test

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

main/templates/pages/adm_ruleset.html

@@ -25,7 +25,7 @@
     </div>
 
   {% for message in messages %}
-  <script>create_notification('{{message}}','','{{message.tags}}',5000)</script>
+  <script>create_notification('{{message}}','','{{message.tags}}',2000)</script>
   {% endfor %}
 
   {% block form %}

main/templates/pages/profile.html

@@ -31,6 +31,7 @@
         alt="Нет изображения"
       >
     </div>
+    <a href="{%url 'password_change' %}">Сменить пароль</a>
   </div>
   <div class="col">
     <h5><span class="badge bg-secondary text-light">Имя пользователя</span> {{ profile.name }}</h5>

main/templates/pages/work.html

@@ -72,7 +72,7 @@
             </form>
         </div>
       {% for message in messages %}
-  <script>create_notification('{{message}}','','{{message.tags}}',5000)</script>
+  <script>create_notification('{{message}}','','{{message.tags}}',2000)</script>
   {% endfor %}
     </div>
 </div>