Add level-builder text-based editors for Multi and Match levels
Merge pull request #906 from code-dot-org/multi_match_crud_levelbuilder

Add level-builder text-based editors for Multi and Match levels
Optimize script update performance
Merge pull request #909 from code-dot-org/optimize_script_update

Optimize script update performance
levelbuilder work
levelbuilder work
cast integers in artist properties
Merge branch 'level-builder' of github.com:code-dot-org/dashboard into level-builder

Conflicts:
	app/models/artist.rb
fix editing blocks properties with form fields
Merge remote-tracking branch 'remotes/origin/finished' into level-builder-merged

Conflicts:
	app/models/artist.rb
	app/models/script.rb
	app/views/levels/editors/_blockly.html.haml
	config/locales/scripts.en.yml
	config/scripts/course2.script
	config/scripts/custom_levels.json
revert custom levels to latest from level-builder environment.
Merge pull request #932 from code-dot-org/level-builder-merged

Level builder merged
Merge pull request #924 from code-dot-org/finished

merge finished into level-builder
add scripts from level-builder
levelbuilder changes to levels
Update sample_level_builder.script
levelbuilder updates
add serialized attributes for predraw_blocks and solution_blocks
Merge branch 'level-builder' of github.com:code-dot-org/dashboard into level-builder

Conflicts:
	config/locales/scripts.en.yml
locale update on levelbuilder