Merge remote-tracking branch 'origin/develop' into develop

src/UI/Content/form.less

@@ -41,8 +41,7 @@
 
   .help-inline {
     display      : inline-block;
-    margin-top   : 8px;
-    padding-left : 0;
+    padding-left : 0px;
 
     @media (max-width: @screen-xs-max) {
       margin-left: 0;

src/UI/Hotkeys/hotkeys.less

@@ -1,7 +1,7 @@
 .hotkeys-modal {
   h3 {
     margin-top    : 0;
-    margin-botton : 0;
+    margin-bottom : 0;
   }
 
   .hotkey-group {
@@ -20,4 +20,4 @@
       font-size : 22px;
     }
   }
-}
+}

src/UI/Movies/MoviesCollection.js

@@ -86,7 +86,7 @@ var Collection = PageableCollection.extend({
 	  	return {};
 	  }
 
-	  if (this.state.pageSize == -1) {
+	  if (this.state.pageSize === -1) {
 	      return this.state;
       }
 
@@ -98,7 +98,7 @@ var Collection = PageableCollection.extend({
     },
 
     parseRecords : function(resp) {
-        if (resp && this.mode !== 'client' && this.state.pageSize != 0 && this.state.pageSize != -1) {
+        if (resp && this.mode !== 'client' && this.state.pageSize !== 0 && this.state.pageSize !== -1) {
             return resp.records;
         }
 
@@ -252,7 +252,7 @@ var Collection = PageableCollection.extend({
     },
 
     add : function(model, options) {
-      if (this.length >= this.state.pageSize && this.state.pageSize != -1) {
+      if (this.length >= this.state.pageSize && this.state.pageSize !== -1) {
         return;
       }
       this.origAdd.call(this, model, options);

src/UI/System/Logs/Table/LogsTableLayoutTemplate.hbs

@@ -1,4 +1,8 @@
 <div id="x-toolbar"/>
+<div class="alert alert-warning alert-dismissable">
+    <a href="#" class="close" data-dismiss="alert" aria-label="close">&times;</a>
+    If the log viewer table does not load, please disable your adblocker and refresh the page.
+</div>
 <div class="row">
     <div class="col-md-12">
         <div id="x-grid" class="table-responsive"/>