edit registration page
Merge branch 'master' of github.com:icily/Farmily