enabled og modules
merged master into 74-add-og..
Merge branch 'master' into s3b1b-dogprofilephotos