Signed-off-by: frnore <frankarj993@gmail.com>
Signed-off-by: frnore <frankarj993@gmail.com>
Merge remote-tracking branch 'origin/master'

Conflicts:
	iSeries/src/funciones/Inicio.java
	iSeries/src/interfaz/VentanaPrincipal.java