[joseo] [Actualiza .props]
[joseo] [Actualiza .jar]
Merge branch 'joseo'
[ajerezg][matias-rodriguez][Se entrega el prototipo final para la demo 3][#43][#44][#45]
Merge branch 'master' into branchNicoDelgado