asdf
Merge branch 'master' of github.com:seguame/Control-Gastos

Conflicts:
	Codigo/Utils/GetInfoEntidad.php