Fix error email -> mail and add users
Fix conflicts
Merge branch 'dev' of github.com:soutenanceplanner/soutenanceplanner into dev