...
Merge branch 'master' of
https://github.com/germansturtz/ClienteServidor.git

Conflicts:
	cinemania/src/main/java/cinemania/dao/ButacaDAO.java
	cinemania/src/main/java/cinemania/dao/CineDAO.java
	cinemania/src/main/java/cinemania/dao/UsuarioDAO.java
	cinemania/src/main/java/cinemania/servicios/ProyeccionServicios.java
Modif