merge in changes made by Andreas
changed the validation of email addresses and made it impossible ot register a user with the same username as someone else