[PEPUS] Pequeñas modificaciones
+ comienzo de driverControladorConjuntoTexto.
Merge branch 'master' of https://github.com/gabi493/PROP
Merge branch 'master' of https://github.com/gabi493/PROP