Merge branch 'test' into dev

app/scripts/app.js

@@ -183,7 +183,10 @@ angular.module('fifoApp',
     //$locationProvider.hashPrefix('!');
   })
 
-.run(function($rootScope, gettextCatalog, gettext, $window) {
+.run(function($rootScope, gettextCatalog, gettext, $window, $templateCache) {
+
+  //Empty ng-table template for pagination
+  $templateCache.put('ng-table/pager.html', '')
 
   var lang = window.navigator.userLanguage || window.navigator.language;
 

app/views/machines.html

@@ -20,7 +20,7 @@
      class='table table-condensed table-hover'
      infinite-scroll='infinitScroll()'
      infinite-scroll-distance="1"
-     ng-table='tableParams' template-pagination='hide'>
+     ng-table='tableParams'>
 
     <tr ng-repeat='vm in vmsFiltered'>
       <td data-title="'Name' | translate" sortable="'config.alias'" class='nowrap' style="background-image: linear-gradient(to right, {{vm.mdata('color')}} 10%, transparent 40%);">