tututu
lo mio
Merge branch 'master' of https://github.com/juanolio04/optimizaApp

Conflicts:
	Server-Web/optimizaAppWeb/target/classes/com/mycompany/services/initializer/OptimizaEntityInitializer$1.class
	Server-Web/optimizaAppWeb/target/maven-archiver/pom.properties
	Server-Web/optimizaAppWeb/target/optimizaAppWeb-1.0/WEB-INF/classes/com/mycompany/services/initializer/OptimizaEntityInitializer$1.class
	Server-Web/optimizaAppWeb/target/optimizaAppWeb-1.0/images/404_Error.png
	Server-Web/optimizaAppWeb/target/optimizaAppWeb-1.0/usuarios.html
	Server-Web/optimizaAppWeb/target/optimizaAppWeb.war