Merge branch 'develop' of http://gitlab.ujaen.es/yotta/pictogram into develop

sails/roles/database/files/upgrade.sql

@@ -117,6 +117,9 @@ INSERT INTO sup_off (id_sup, id_off)
 SELECT id, id_off
 SELECT id, id_off
 FROM supervisor;
 FROM supervisor;
 
 
+ALTER TABLE supervisor DROP COLUMN id_off;
+ALTER TABLE student DROP COLUMN id_off;
+
 ALTER TABLE stu_sup
 ALTER TABLE stu_sup
 ADD CONSTRAINT `stu_sup_ibfk_1` FOREIGN KEY (`id_stu`) REFERENCES `student` (`id`);
 ADD CONSTRAINT `stu_sup_ibfk_1` FOREIGN KEY (`id_stu`) REFERENCES `student` (`id`);
 ALTER TABLE stu_sup
 ALTER TABLE stu_sup