add email field to datagrid for usermgr page
Merge remote-tracking branch 'origin/master'