iupi
Merge branch 'master' of https://github.com/juanolio04/optimizaApp

Conflicts:
	Server-Web/optimizaAppWeb/src/main/java/com/mycompany/services/initializer/OptimizaEntityInitializer.java
	Server-Web/optimizaAppWeb/target/classes/com/mycompany/services/initializer/OptimizaEntityInitializer$1.class