Added subgroups and members list
Merge branch 'master' of github.com:jonatanl/fellesprosjekt
Fixed merge conflicts