Merge branch 'develop' into release

Conflicts:
	build.xml

Y deshabilitar el registro
Merge branch 'release'