Merge branch 'hotfix-2.0.4' into development
fix bug that caused new users not to show up in user list when user type is omitted from user form
Merge branch 'hotfix-2.0.5'