Add uniqueness email and username #5
Merge branches 'master' and 'seb_5'