Adds group privacy option
Merge branch 'master' into groups
More stuff with regard to group privacy!