Update base templates
Merge conflict of base template
Correct fields sorting for registration (email first)
Merge pull request #15 from Flo-Schield-Bobby/registration-page

Registration page