Prueba de creacion de nuevo branch
merge
Se integraron los casos de uso
Se modifico la autentificacion
test merge 001
Se cambio el nombre de los modelos
Merge branch 'origin/alonso'

Conflicts:
	ME_BusinessLogicLayer/src/logic/Login.java
	ME_CommonLayer/src/models/GeneroModel.java
	ME_CommonLayer/src/models/ResennaModel.java
	ME_CommonLayer/src/models/TituloModel.java
	ME_CommonLayer/src/models/UserModel.java
	ME_DataAccessLayer/src/repositories/UserRepository.java
	ME_PresentationLayer/WebContent/WEB-INF/views/ConfigCuenta_1.html
	ME_PresentationLayer/WebContent/WEB-INF/views/Login-bck.jsp
	ME_PresentationLayer/WebContent/WEB-INF/web.xml
	ME_PresentationLayer/WebContent/js/Login.jsp
	ME_PresentationLayer/WebContent/js/Perfil.jsp
	ME_PresentationLayer/src/controllers/LoginServlet.java
	ME_ServiceLayer/WebContent/WEB-INF/web.xml