profile view
merge with master
fixing merge with master
fixing database form for regular user
fix user role's permission command
comment