Merge branch 'fix-108-dashboard-no-volumes' into internal

app/components/dashboard/dashboardController.js

@@ -50,8 +50,10 @@ function ($scope, $q, Config, Container, Image, Network, Volume, Info) {
 
   function prepareVolumeData(d) {
     var volumes = d.Volumes;
+    if (volumes) {
       $scope.volumeData.total = volumes.length;
     }
+  }
 
   function prepareNetworkData(d) {
     var networks = d;

gruntFile.js

@@ -152,11 +152,11 @@ module.exports = function (grunt) {
                 }
             },
             angular: {
-                src: ['bower_components/angular/angular.js',
+                src: ['bower_components/angular/angular.min.js',
                     'bower_components/angular-sanitize/angular-sanitize.min.js',
                     'bower_components/angular-cookies/angular-cookies.min.js',
                     'bower_components/angular-ui-router/release/angular-ui-router.min.js',
-                    'bower_components/angular-resource/angular-resource.js',
+                    'bower_components/angular-resource/angular-resource.min.js',
                     'bower_components/angular-bootstrap/ui-bootstrap-tpls.min.js',
                     'bower_components/angular-ui-select/dist/select.min.js'],
                 dest: '<%= distdir %>/js/angular.js'