More progress on user management screen, relates to issue #48
Merge branch 'origin/develop'