Correctif merge, correctif user_id
Merge branch 'users' into sprint2