Merge remote-tracking branch 'origin/develop' into develop

sails/src/assets/scripts/modules/student/views/pictoconfig.html

@@ -64,7 +64,7 @@
             </div>
             <div class="row">
               <div class="col-md-6">
-                <select class="form-control" ng-model="grid">
+                <select class="form-control" ng-model="studentPicto.id_child_grid">
                   <option value="">--- Ninguno ---</option>
                   <option
                     ng-repeat="grid in gridsList track by $index"