Add username on login #3
Merge branches 'master' and 'seb_3'