Merge branch 'master-qa' into jpatonni
Add gasto futuro finished
Merge branch 'master-qa' into jpatonni
fuente-dinero listo excepto "delete"
Merge branch 'jpatonni' into master-qa
Merge branch 'master-qa' of https://github.com/proyecto4-tecdroid/miwapp-www into rquesada
Merge remote-tracking branch 'origin/master-qa' into egomez