fccrvgtv
cdc
Merge branch 'developer' of https://github.com/Anteo4Ever/dawii.git into
developer

Conflicts:
	rci-cli/WebContent/registrarse.xhtml