updated templates/registration changes
Merge branch 'master' of https://github.com/ih01/go_fish