upgrade user role's system
some design bug fix
Merge branch 'origin/develop'