Ajustes

Agua en el hoyo
Merge remote-tracking branch 'origin/master'

Conflicts:
	App/catalogo/2.php
	App/catalogo/42.php
	App/catalogo/85.php
	App/catalogo/89.php
	App/frmIndex.php
	App/nuevo/nuevoRecibo.php
Merge branch 'master' of https://github.com/darkber/egresos

Conflicts:
	App/catalogo/89.php
	App/catalogo/92.php
	App/editar/editarRecibo.php
	App/nuevo/nuevoRecibo.php