teams/colleagues again in templates
Merge remote-tracking branch 'origin/master'
teams/colleagues again in templates