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

deploy to level-builder
levelbuilder changes
Merge branch 'level-builder' of github.com:code-dot-org/dashboard into level-builder
merge blockly from finished/staging to level-builder
Merge pull request #953 from code-dot-org/level-builder-merger

merge blockly from finished/staging to level-builder
Merge remote-tracking branch 'remotes/origin/finished' into level-builder

Conflicts:
	config/scripts/custom_levels.json
	public/blockly-dist/js/af_za/maze.js
	public/blockly-dist/js/af_za/maze.min.js
	public/blockly-dist/js/ar_sa/maze.js
	public/blockly-dist/js/ar_sa/maze.min.js
	public/blockly-dist/js/az_az/maze.js
	public/blockly-dist/js/az_az/maze.min.js
	public/blockly-dist/js/bg_bg/maze.js
	public/blockly-dist/js/bg_bg/maze.min.js
	public/blockly-dist/js/bn_bd/maze.js
	public/blockly-dist/js/bn_bd/maze.min.js
	public/blockly-dist/js/ca_es/maze.js
	public/blockly-dist/js/ca_es/maze.min.js
	public/blockly-dist/js/cs_cz/maze.js
	public/blockly-dist/js/cs_cz/maze.min.js
	public/blockly-dist/js/cy_gb/maze.js
	public/blockly-dist/js/cy_gb/maze.min.js
	public/blockly-dist/js/da_dk/maze.js
	public/blockly-dist/js/da_dk/maze.min.js
	public/blockly-dist/js/de_de/maze.js
	public/blockly-dist/js/de_de/maze.min.js
	public/blockly-dist/js/el_gr/maze.js
	public/blockly-dist/js/el_gr/maze.min.js
	public/blockly-dist/js/en_ploc/maze.js
	public/blockly-dist/js/en_ploc/maze.min.js
	public/blockly-dist/js/en_us/maze.js
	public/blockly-dist/js/en_us/maze.min.js
	public/blockly-dist/js/es_es/maze.js
	public/blockly-dist/js/es_es/maze.min.js
	public/blockly-dist/js/eu_es/maze.js
	public/blockly-dist/js/eu_es/maze.min.js
	public/blockly-dist/js/fa_ir/maze.js
	public/blockly-dist/js/fa_ir/maze.min.js
	public/blockly-dist/js/fi_fi/maze.js
	public/blockly-dist/js/fi_fi/maze.min.js
	public/blockly-dist/js/fil_ph/maze.js
	public/blockly-dist/js/fil_ph/maze.min.js
	public/blockly-dist/js/fr_fr/maze.js
	public/blockly-dist/js/fr_fr/maze.min.js
	public/blockly-dist/js/he_il/maze.js
	public/blockly-dist/js/he_il/maze.min.js
	public/blockly-dist/js/hi_in/maze.js
	public/blockly-dist/js/hi_in/maze.min.js
	public/blockly-dist/js/hr_hr/maze.js
	public/blockly-dist/js/hr_hr/maze.min.js
	public/blockly-dist/js/hu_hu/maze.js
	public/blockly-dist/js/hu_hu/maze.min.js
	public/blockly-dist/js/id_id/maze.js
	public/blockly-dist/js/id_id/maze.min.js
	public/blockly-dist/js/is_is/maze.js
	public/blockly-dist/js/is_is/maze.min.js
	public/blockly-dist/js/it_it/maze.js
	public/blockly-dist/js/it_it/maze.min.js
	public/blockly-dist/js/ja_jp/maze.js
	public/blockly-dist/js/ja_jp/maze.min.js
	public/blockly-dist/js/ko_kr/maze.js
	public/blockly-dist/js/ko_kr/maze.min.js
	public/blockly-dist/js/lt_lt/maze.js
	public/blockly-dist/js/lt_lt/maze.min.js
	public/blockly-dist/js/ms_my/maze.js
	public/blockly-dist/js/ms_my/maze.min.js
	public/blockly-dist/js/nl_nl/maze.js
	public/blockly-dist/js/nl_nl/maze.min.js
	public/blockly-dist/js/no_no/maze.js
	public/blockly-dist/js/no_no/maze.min.js
	public/blockly-dist/js/pl_pl/maze.js
	public/blockly-dist/js/pl_pl/maze.min.js
	public/blockly-dist/js/pt_br/maze.js
	public/blockly-dist/js/pt_br/maze.min.js
	public/blockly-dist/js/pt_pt/maze.js
	public/blockly-dist/js/pt_pt/maze.min.js
	public/blockly-dist/js/ro_ro/maze.js
	public/blockly-dist/js/ro_ro/maze.min.js
	public/blockly-dist/js/ru_ru/maze.js
	public/blockly-dist/js/ru_ru/maze.min.js
	public/blockly-dist/js/sk_sk/maze.js
	public/blockly-dist/js/sk_sk/maze.min.js
	public/blockly-dist/js/sl_si/maze.js
	public/blockly-dist/js/sl_si/maze.min.js
	public/blockly-dist/js/sq_al/maze.js
	public/blockly-dist/js/sq_al/maze.min.js
	public/blockly-dist/js/sr_sp/maze.js
	public/blockly-dist/js/sr_sp/maze.min.js
	public/blockly-dist/js/sv_se/maze.js
	public/blockly-dist/js/sv_se/maze.min.js
	public/blockly-dist/js/ta_in/maze.js
	public/blockly-dist/js/ta_in/maze.min.js
	public/blockly-dist/js/th_th/maze.js
	public/blockly-dist/js/th_th/maze.min.js
	public/blockly-dist/js/tr_tr/maze.js
	public/blockly-dist/js/tr_tr/maze.min.js
	public/blockly-dist/js/uk_ua/maze.js
	public/blockly-dist/js/uk_ua/maze.min.js
	public/blockly-dist/js/ur_pk/maze.js
	public/blockly-dist/js/ur_pk/maze.min.js
	public/blockly-dist/js/vi_vn/maze.js
	public/blockly-dist/js/vi_vn/maze.min.js
	public/blockly-dist/js/zh_cn/maze.js
	public/blockly-dist/js/zh_cn/maze.min.js
	public/blockly-dist/js/zh_tw/maze.js
	public/blockly-dist/js/zh_tw/maze.min.js
levelbuilder changes
Merge branch 'level-builder' of github.com:code-dot-org/dashboard into level-builder
Merge pull request #963 from code-dot-org/finished

merge finished into level-builder
Merge pull request #966 from code-dot-org/finished

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

deploy finished to level-builder
levelbuilder changes
Merge branch 'level-builder' of github.com:code-dot-org/dashboard into level-builder
Merge branch 'level-builder' of github.com:code-dot-org/dashboard into level-builder
Merge pull request #976 from code-dot-org/finished

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

deploy to level-builder
Merge branch 'level-builder' of github.com:code-dot-org/dashboard into level-builder
levelbuilder changes
Merge pull request #981 from code-dot-org/finished

finished -> levelbuilder