vista
Merge remote-tracking branch 'origin/master'

Conflicts:
	agualima/src/main/webapp/WEB-INF/views/procesos/almacen/stock_producto/stockProductoJs.jsp