Cosas
Merge branch 'Jhoel' of https://github.com/capotapps/Prueba.git into
Jhoel

Conflicts:
	HouseExpenses/bin/HouseExpenses.apk
	HouseExpenses/bin/classes.dex
	HouseExpenses/bin/resources.ap_