Merge origin/master

Conflicts:
	src/java/es/rumbosistemas/sctrakker/datos/RolDAO.java