prueba:wq
prueba merge Merge branch 'master' of https://github.com/ingjaso/acuario

Conflicts:
	Conf/Configuracion_Controller.php
	view/templates_c/4c48565ef581c4fe108d1dcb4f912fa12a2f2b88.file.TABLA_REPORTE_ESTANQUE_HABITAT.tpl.php
	view/templates_c/7fe235e01968f94089d11cafbf3600493dbd789c.file.AGREGAR.tpl.php
	view/templates_c/ce9b1106bdb688bc28baed44bef4b1d55acfb4d6.file.AGREGAR_LOTE.tpl.php