Merge origin/master

Conflicts:
	grails-app/controllers/app/UsuarioController.groovy
	grails-app/views/usuario/show.gsp