Bug fix - groups not shown just after login
Merge branch 'development' into iss19