mas cambios en nueva venta.
Merge branch 'develop' of https://github.com/jotaemepereira/PIS-GR4-2014 into develop