Added reserved memoyr column.

Merge branch 'test' into dev
Merge.
project-fifo
diff --git a/app/views/servers.html b/app/views/servers.html
@@ -10,6 +10,7 @@
             <th class='nowrap' translate>Agent ver</th>
             <th class='' translate>Ram</th>
             <th class='' translate>Free</th>
+            <th class='' translate>Reserved</th>
             <th translate>Networks</th>
             <th translate>Capabilities</th>
           </tr>
@@ -22,6 +23,7 @@
             <td class='nowrap'><small>{{hyper['version'].split(',')[0]}}</small></td>
             <td class='mono'>{{hyper.resources['total-memory']}} MB</td>
             <td class='mono'>{{hyper.resources['free-memory']}} MB</td>
+            <td class='mono'>{{hyper.resources['reserved-memory'] || 0}} MB</td>
             <td>{{hyper.networks.sort().join(', ')}}</td>
             <td>{{hyper.virtualisation.join(', ')}}</td>
           </tr>

diff --git a/dist/console.html b/dist/console.html
@@ -11,7 +11,7 @@
   </head>
   <body>
 
-    <script src="scripts/2e7f404f.console.js"></script>
+    <script src="scripts/166e54bc.console.js"></script>
 
   </body>
 </html>
diff --git a/dist/index.html b/dist/index.html
@@ -15,12 +15,12 @@
     </div>
     <div class="ng-view-include container" ng-view></div>
 
-    <script src="scripts/f0de7f48.bower_components.js"></script>
+    <script src="scripts/a2f59ff8.bower_components.js"></script>
 
     <script src="scripts/config.js"></script>
-    <script src="scripts/60806743.main.js"></script>
+    <script src="scripts/5c117e76.main.js"></script>
 
-    <script src="scripts/977c17e5.vendor.js"></script>
+    <script src="scripts/6c6372bf.vendor.js"></script>
 
 </body>
 </html>
diff --git a/dist/scripts/2e7f404f.console.js → dist/scripts/166e54bc.console.js b/dist/scripts/2e7f404f.console.js → dist/scripts/166e54bc.console.js
diff --git a/dist/scripts/1f69a46e.vnc_lib.js b/dist/scripts/1f69a46e.vnc_lib.js
diff --git a/dist/scripts/5c117e76.main.js b/dist/scripts/5c117e76.main.js
diff --git a/dist/scripts/60806743.main.js b/dist/scripts/60806743.main.js
diff --git a/dist/scripts/6c6372bf.vendor.js b/dist/scripts/6c6372bf.vendor.js
diff --git a/dist/scripts/8199e600.vnc_lib.js b/dist/scripts/8199e600.vnc_lib.js
diff --git a/dist/scripts/87ade974.vnc.js → dist/scripts/90492b24.vnc.js b/dist/scripts/87ade974.vnc.js → dist/scripts/90492b24.vnc.js
diff --git a/dist/scripts/977c17e5.vendor.js b/dist/scripts/977c17e5.vendor.js
diff --git a/dist/scripts/a2f59ff8.bower_components.js b/dist/scripts/a2f59ff8.bower_components.js
diff --git a/dist/scripts/f0de7f48.bower_components.js b/dist/scripts/f0de7f48.bower_components.js
diff --git a/dist/views/servers.html b/dist/views/servers.html
@@ -10,6 +10,7 @@
             <th class='nowrap' translate>Agent ver</th>
             <th class='' translate>Ram</th>
             <th class='' translate>Free</th>
+            <th class='' translate>Reserved</th>
             <th translate>Networks</th>
             <th translate>Capabilities</th>
           </tr>
@@ -22,6 +23,7 @@
             <td class='nowrap'><small>{{hyper['version'].split(',')[0]}}</small></td>
             <td class='mono'>{{hyper.resources['total-memory']}} MB</td>
             <td class='mono'>{{hyper.resources['free-memory']}} MB</td>
+            <td class='mono'>{{hyper.resources['reserved-memory'] || 0}} MB</td>
             <td>{{hyper.networks.sort().join(', ')}}</td>
             <td>{{hyper.virtualisation.join(', ')}}</td>
           </tr>

diff --git a/dist/vnc.html b/dist/vnc.html
@@ -41,9 +41,9 @@
     </footer>
     <script type="application/javascript">INCLUDE_URI="vendor/vnc/";</script>
 
-    <script src="scripts/8199e600.vnc_lib.js"></script>
+    <script src="scripts/1f69a46e.vnc_lib.js"></script>
 
-    <script src="scripts/87ade974.vnc.js"></script>
+    <script src="scripts/90492b24.vnc.js"></script>