Move senex_shop templates into main project. Add registration templates.
Fix merge conflicts in TODO.txt.