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

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

Conflicts:
	config/scripts/course2.script
Merge pull request #1012 from code-dot-org/finished

finished -> levelbuilder
Merge pull request #1014 from code-dot-org/finished

finished -> levelbuilder
Merge pull request #1015 from code-dot-org/finished

finished -> levelbuilder
Merge pull request #1018 from code-dot-org/finished

finished -> levelbuilder
Changes from level builder
Merge pull request #1023 from code-dot-org/level-builder

Level builder changes