Changed EER diagram for the database and the username datatype to 30
characters so that email addresses can fit if we chose to use email
addresses as username.
Merge branch 'jani'