Merge pull request #1022 from code-dot-org/finished

Deploy to level builder
Merge pull request #1026 from code-dot-org/finished

Deploy to level builder
levelbuilder changes
levelbuilder changes
levelbuilder changes
convert all move/turn/repeat blocks in custom levels to constant blocks
levelbuilder changes
Deploy finished into level-builder
Merge branch 'level-builder' of github.com:code-dot-org/dashboard into level-builder
Merge remote-tracking branch 'origin/level-builder' into finished

Conflicts:
	config/locales/match.en.yml
	config/locales/multi.en.yml
update match locale file
Merge pull request #1039 from code-dot-org/finished

Deploy to delivered