Conflicts: sails/src/assets/app/i18n/en-gb.json sails/src/assets/app/i18n/es-es.json sails/src/assets/scripts/modules/student/controllers/addpicto.js sails/src/assets/scripts/modules/student/views/addpicto.html sails/src/assets/styles/main.less
