Merge branch 'master' into develop

sails/src/api/models/Supervisor.js

@@ -275,6 +275,8 @@ module.exports = {
           .catch(function (err) {
             callback(err, l);
           });
+       } else {
+	callback(err, l);
        }
       }); // end async.eachSeries
     })