Merge remote-tracking branch 'remotes/origin/master' into react-tree

# Conflicts:
#	shared/js/ui/modal/permission/HTMLPermissionEditor.ts

ChangeLog.md

@@ -1,4 +1,7 @@
 # Changelog:
+* **28.03.20**
+    - Fixed a bug within the permission editor which kicks you from the server
+    
 * **21.03.20**
     - Fixed identity import throwing an "btoa" error
     

shared/html/templates.html

@@ -2237,7 +2237,7 @@
                     </div>
 
                     <div class="container audio-microphone">
-                        {{include tmpl="#tmpl_settings-microphone" /}}
+                        {{include tmpl="tmpl_settings-microphone" /}}
                     </div>
                     <div class="container audio-speaker">
                         <div class="left">
@@ -2326,7 +2326,7 @@
                     </div>
 
                     <div class="container identity-profiles">
-                        {{include tmpl="#tmpl_settings-profiles" /}}
+                        {{include tmpl="tmpl_settings-profiles" /}}
                     </div>
                     <div class="container identity-forum">
                         <div class="fill">

shared/html/templates/modal/newcomer.html

@@ -38,10 +38,10 @@
                         </div>
                     </div>
                     <div class="step step-microphone">
-                        {{include tmpl="#tmpl_settings-microphone" /}}
+                        {{include tmpl="tmpl_settings-microphone" /}}
                     </div>
                     <div class="step step-identity">
-                        {{include tmpl="#tmpl_settings-profiles" /}}
+                        {{include tmpl="tmpl_settings-profiles" /}}
                     </div>
                     <div class="step step-speaker">
                         <h1>TODO</h1>