Enhance User to facilitate adding advisors
Merge branch 'UserAdmin' into dev