Flujo parcial de la vista mostrar registro.
Merge branch 'master' of github.com:LogicalBricks/charybox

Conflicts:
	app/models/registro.rb