avance inventario
avance inventario factory de servicios
merge
merge
merge
merge
Merge origin/master

Conflicts:
	Tornado-ejb/src/main/java/edu/unal/dto/UserDTO.java
	Tornado-ejb/src/main/java/edu/unal/factory/DAOFactory.java
	Tornado-web/src/main/java/login/beans/UserLogin.java