sed
Merge branch 'master' of https://github.com/consultoresUNT/agualima.git

Conflicts:
	agualima/src/main/webapp/WEB-INF/views/procesos/almacen/configuracion/configuracionJs.jsp