Server Side Development
Merge branch 'develop' of https://github.com/Kinesis-P4/geo-sales into develop
Merge pull request #19 from Kinesis-P4/sprint2-rm-registro-pagos

This merge is approved! Proceed to Merge into develop
Merge pull request #20 from Kinesis-P4/sprint2-rm-registro-pagos

Set the popup to zero in amount field - Approved by RM and ready to be merged
Merge branch 'develop' of https://github.com/Kinesis-P4/geo-sales into develop
last fixes to push
Se agrega Editar de clientes
Merge pull request #21 from Kinesis-P4/sprint3-lb

Se agrega Editar de clientes - Approved, ready to be merged!
Merge branch 'develop' of https://github.com/Kinesis-P4/geo-sales into sprint3-rm-pantalla-configuracion

Conflicts:
	www/index.html
	www/scripts/app.js