registration refactor
Merge branch 'master' of https://github.com/dnul/yoreciclo2013