Man. & Groups pages code checkin. Work in progress.
Merge branch 'master' of https://github.com/VikingOrg/viking.git