Merge branch 'dev' into users
Merge branch 'dev' into users
Add user brief info card and change corresponding welcome page
Modified users#show page
Unify user card style
Add phone and jd fields to users table and change corresponding pages
Fix users#edit action and view
Merge branch 'users' into dev