some helper methods I've been using for prize CS requests
Merge branch 'finished' of github.com:code-dot-org/dashboard into finished
Add level-builder text-based editors for Multi and Match levels
Merge branch 'finished' of github.com:code-dot-org/dashboard into finished
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 branch 'finished' of github.com:code-dot-org/dashboard into finished
Changes in stepMode feature to account for changes to step mode
one more test
Automatically built
fix editing blocks properties with form fields
Merge pull request #915 from code-dot-org/stepModeChanges

Changes in stepMode feature to account for changes to step mode
Automatically built
Automatically built