uulti
listos 3.2-3.4 Iter 2.
Merge branch 'master' of https://github.com/camiloforero/SisTrans.git

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