Intermedio
Merge branch 'master' of https://github.com/camiloforero/SisTrans.git

Conflicts:
	CentralAbastos/src/co/edu/uniandes/centralAbastos/dao/DAOAlmacen.java