Merge branch 'develop' of http://gitlab.ujaen.es/yotta/pictogram into develop

sails/src/assets/scripts/modules/student/controllers/collections.js

@@ -57,7 +57,6 @@ dashboardControllers.controller('StudentCollectionsCtrl', function StudentCollec
   $scope.showActiveGrid = function () {
     var active = $scope.gridsList.find((x) => x.active);
     $scope.showGrid(active.id, 'menu');
-    $scope.viewingGrid = active;
   };
 
   /**
@@ -78,6 +77,7 @@ dashboardControllers.controller('StudentCollectionsCtrl', function StudentCollec
     .success(function (grid) {
     	grid.name = $translate.instant(grid.name);
       grid.pictos.forEach(placePicto);
+      $scope.viewingGrid = grid;
 
       $scope.loadingPictos = false;
 

sails/src/assets/styles/main.css

@@ -1152,7 +1152,7 @@ input.editable.grid-name {
     background-color:#c5e4c5;
 }
 .grid-panel-select-optioninactive{
-    background-color: #eeffee;/*transparent;*/
+    background-color: transparent;
 }
 .grid-panel-select-optionselected{
     background-color:#c5e4c5;