[nueva venta] idem commit anterior
Merge branch 'develop' of https://github.com/jotaemepereira/PIS-GR4-2014.git into develop