teams for challenges
Merge remote-tracking branch 'origin/master'

Conflicts:
	elaboration/templates/elaboration/elaboration_tag.html