Merge branch 'Xiemuqing-Xiao' into '64-as-an-admin-i-want-to-through-a-table-to-add-new-user-so-that-admin-can-give-user-a-new-account'

Resolves 64

See merge request !51