Bugfixing joinGroup
Merge branch 'Story5_henrik' into Story5