Agregar atributo 'activo' a Registro.
Merge branch 'master' of github.com:LogicalBricks/charybox

Conflicts:
	config/routes.rb