register feature complete
Merge branch 'register'