again the teamjoin-event
Revert "again the teamjoin-event"

This reverts commit c666acf86888b68cc4634f86d02cc697da680e4b.
Revert "Revert "again the teamjoin-event""

This reverts commit 26a11d5e26b22263b4df7d2805b04a531a8a3042.
Some Fixes
Merge remote-tracking branch 'origin/develop'