Using Klaas' version of requirements for 'registration'
Username is max 30 chars; fixed bug when copying in email into username
Merge remote branch 'origin/master'