fixed login
Merge branch 'antonin'
Modify LoginFragment
Merge branch 'master' of github.com:QuentinBontemps/TrybaProject
fix
Fix add user
Merge branch 'master' of github.com:QuentinBontemps/TrybaProject
Merge branch 'antonin'
Add type_material in ClientOrder
Add order client
fixe merge
fixe conflicts