merge branch
loaders test
fix merge
fix merge conflicts
Update list user design
Fix add user
Update message scan, and add check in add order fragment