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

Conflicts:
	media/js/challenges.js
Merge remote-tracking branch 'origin/master'
Added first version of point info