Merge origin/master

Conflicts:
	DesignerRHN/DesignerRHN-ejb/src/java/InterfacePersistencia/PersistenciaDeportesInterface.java
Merge origin/master