Fixed merge conflicts for converse.js

converse.css

@@ -25,6 +25,15 @@
     height: 1.1em;
 }
 
+#toggle-online-users {
+    display: none;
+}
+
+#connecting-to-chat {
+    background: url('/spinner.gif') no-repeat;
+    padding-left: 1.4em;
+}
+
 .chat-head {
     color: #ffffff;
     margin: 0;