Fixes some issues caused by the merge.

index.html

@@ -158,7 +158,7 @@
                         <i id="mute" class="icon-microphone"></i>
                     </a>
                     <div class="header_button_separator"></div>
-                    <a class="button" id="toolbar_button_camera" data-container="body" data-toggle="popover" data-placement="bottom" shortcut="toggleVideoPopover" content="Start / stop camera" onclick='toggleVideo();'>
+                    <a class="button" id="toolbar_button_camera" data-container="body" data-toggle="popover" data-placement="bottom" shortcut="toggleVideoPopover" content="Start / stop camera">
                         <i id="video" class="icon-camera"></i>
                     </a>
                     <span id="authentication" style="display: none">

modules/UI/videolayout/ConnectionIndicator.js

@@ -91,7 +91,7 @@ ConnectionIndicator.prototype.generateText = function () {
     }
 
     var resolutionValue = null;
-    if(this.resolution)
+    if(this.resolution && this.jid != null)
     {
         var keys = Object.keys(this.resolution);
         if(keys.length == 1)