Changes from level builder
Merge branch 'level-builder' of github.com:code-dot-org/dashboard into level-builder

Conflicts:
	config/scripts/course2.script