fix merge errors and reach full jshint compliance

www/common/cryptpad-common.js

@@ -47,8 +47,6 @@ define([
         var host = window.location.host;
         var url = protocol + '//' + host + path;
 
-        console.log(url);
-
         return url;
     };
 
@@ -797,7 +795,7 @@ define([
                 });
         }
         if (rightside) {
-            button.addClass('rightside-button')
+            button.addClass('rightside-button');
         }
         return button;
     };

www/common/toolbar.js

@@ -180,9 +180,10 @@ define([
         var lagLight = $('<div>', {
             'class': 'lag'
         });
+        var title;
         if(lag) {
           firstConnection = false;
-          var title = Messages.lag + ' : ' + lag + ' ms\n';
+          title = Messages.lag + ' : ' + lag + ' ms\n';
           if (lag.waiting || lag > 1000) {
             lagLight.addClass('lag-orange');
             title += Messages.orangeLight;