fix user role and some small bug
compelete the rigts function and some small bug
fix some small bug
for merge
master for merge
master for confit