Merge branch 'master' into develop

sails/src/api/policies/isSupervisorOfStudentOrIsSupAdminOrIsStudent.js

@@ -3,7 +3,7 @@ module.exports = function isSupervisorOfStudentOrIsSupAdminOrIsStudent (req, res
   // sails.log("TOKEN: " + JSON.stringify(req.token));
 
   if (!req.params.id_stu)
-    return res.json(401, {error: 'Access denied 1'}); // If it is a student, then is ok
+    return res.json(401, {error: 'Access denied 1'}); 
 
     Student.findOne(req.params.id_stu)
 	.then(function (s) {
@@ -13,7 +13,7 @@ module.exports = function isSupervisorOfStudentOrIsSupAdminOrIsStudent (req, res
 	    if (req.token.office && s.office == req.token.office.id && req.token.isSupAdmin)
 		return next(); // Is Office's administrator
 
-	    s.supervisors((err, sups) => {
+	    Student.supervisors(req.params.id_stu, function(err, sups) {
 		if (err || !sups || sups.length == 0)
 		    return res.json(401, {error: "This student has no supervisors associated"});