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 %}