Merged

index.html

@@ -5,14 +5,14 @@
     <script src="libs/strophejingle.bundle.js?v=7"></script><!-- strophe.jingle bundle -->
     <script src="libs/colibri.js?v=7"></script><!-- colibri focus implementation -->
     <script src="//code.jquery.com/ui/1.10.4/jquery-ui.js"></script>
-    <script src="muc.js?v=5"></script><!-- simple MUC library -->
+    <script src="muc.js?v=6"></script><!-- simple MUC library -->
     <script src="estos_log.js?v=2"></script><!-- simple stanza logger -->
-    <script src="app.js?v=18"></script><!-- application logic -->
+    <script src="app.js?v=20"></script><!-- application logic -->
     <script src="etherpad.js?v=1"></script><!-- etherpad plugin -->
     <script src="smileys.js?v=1"></script><!-- smiley images -->
     <script src="replacement.js?v=5"></script><!-- link and smiley replacement -->
     <link href="//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.css" rel="stylesheet">
-    <link rel="stylesheet" type="text/css" media="screen" href="css/main.css?v=15"/>
+    <link rel="stylesheet" type="text/css" media="screen" href="css/main.css?v=16"/>
     <link rel="stylesheet" href="css/jquery-impromptu.css?v=4">
     <link rel="stylesheet" href="css/modaldialog.css?v=3">
     <script src="libs/jquery-impromptu.js"></script>