post-merge-commit

...end Angular 4/src/app/layout/matefun/matefun.component.ts

Frontend Angular 4/src/app/shared/config.ts

Frontend Angular 4/src/app/shared/modal/detalle.component.ts

Servidor JEE/WebContent/index.html

...idor JEE/src/main/java/edu/proygrado/ejb/ArchivosEJB.java

...dor JEE/src/main/java/edu/proygrado/ejb/CommandsBean.java

...JEE/src/main/java/edu/proygrado/ejb/EstadoSistemaEJB.java

...idor JEE/src/main/java/edu/proygrado/ejb/InvitadoEJB.java

...r JEE/src/main/java/edu/proygrado/ejb/login/LoginEJB.java

Servidor JEE/src/main/java/edu/proygrado/modelo/Admin.java

...idor JEE/src/main/java/edu/proygrado/utils/Constants.java

scripts/deployAWS-Win.bat

scripts/matar.bat

scripts/reiniciarAWS.bat