Version 20-05-2014
Merge remote-tracking branch 'origin-javi/master'

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