registration wip and unification with client
Merge branch 'master' of github.com:mugurm/acton