activity layout adaptations
Merge remote-tracking branch 'origin/master'

Conflicts:
	challenge/templates/challenge/challenges_open.html
	elaboration/templates/elaboration/elaboration_tag.html