Work in progress for discussion.
Merge branch 'optional-hints2' of github.com:code-dot-org/dashboard into optional-hints2

Conflicts:
	app/models/experiment_activity.rb