Merge branch 'gh-pages'
Registration
Updated registration form
Merge branch 'master' into gh-pages