Merge branch 'develop' of http://scm.ujaen.es/softuno/pictogram into fernando_branch

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

@@ -149,7 +149,7 @@ dashboardControllers.controller('StudentCollectionsCtrl', function StudentCollec
             action: 'delete',
             action: 'delete',
             attributes: {
             attributes: {
               id_stu: $scope.studentData.id,
               id_stu: $scope.studentData.id,
-              stu_picto: studentPicto.id
+              stu_picto: studentPicto
             }
             }
           }, function () {});
           }, function () {});
 
 
@@ -175,7 +175,7 @@ dashboardControllers.controller('StudentCollectionsCtrl', function StudentCollec
             action: 'delete',
             action: 'delete',
             attributes: {
             attributes: {
               id_stu: $scope.studentData.id,
               id_stu: $scope.studentData.id,
-              stu_picto: studentPicto.id
+              stu_picto: studentPicto
             }
             }
           }, function () {});
           }, function () {});
 
 

sails/src/config/sockets.js

@@ -13,7 +13,7 @@
 
 
 module.exports.sockets = {
 module.exports.sockets = {
 
 
-  pingTimeout: 20000, // set timeout to 20 secs
+  pingTimeout: 60000, // set timeout to 60 secs
 
 
   /***************************************************************************
   /***************************************************************************
   *                                                                          *
   *                                                                          *