merged
no message
Pull from upsatream.
Merge branch 'master' of https://github.com/codecombat/codecombat

Conflicts:
	app/assets/main.html
	scripts/windows/coco-dev-setup/batch/config/finished_header.coco
	scripts/windows/coco-dev-setup/batch/config/github_header.coco
	scripts/windows/coco-dev-setup/batch/config/install_header.coco
	scripts/windows/coco-dev-setup/batch/config/npm_and_brunch_header.coco
	scripts/windows/coco-dev-setup/batch/config/readme.coco
	scripts/windows/coco-dev-setup/batch/localisation/de.coco
	scripts/windows/coco-dev-setup/batch/localisation/fr.coco
	scripts/windows/coco-dev-setup/batch/localisation/languages.coco
	scripts/windows/coco-dev-setup/batch/localisation/zh-HANS.coco
	scripts/windows/coco-dev-setup/batch/localisation/zh-HANT.coco
	scripts/windows/coco-dev-setup/batch/localisation/zh.coco
	scripts/windows/coco-dev-setup/batch/scripts/ask_question.bat
	scripts/windows/coco-dev-setup/batch/scripts/download_and_install_app.bat
	scripts/windows/coco-dev-setup/batch/scripts/download_and_install_applications.bat
	scripts/windows/coco-dev-setup/batch/scripts/get_array.bat
	scripts/windows/coco-dev-setup/batch/scripts/get_config.bat
	scripts/windows/coco-dev-setup/batch/scripts/get_download.bat
	scripts/windows/coco-dev-setup/batch/scripts/get_extension.bat
	scripts/windows/coco-dev-setup/batch/scripts/get_extension.ps1
	scripts/windows/coco-dev-setup/batch/scripts/get_language.bat
	scripts/windows/coco-dev-setup/batch/scripts/get_local_text.bat
	scripts/windows/coco-dev-setup/batch/scripts/get_path_safe.bat
	scripts/windows/coco-dev-setup/batch/scripts/get_system_information.bat
	scripts/windows/coco-dev-setup/batch/scripts/get_text.bat
	scripts/windows/coco-dev-setup/batch/scripts/get_var.ps1
	scripts/windows/coco-dev-setup/batch/scripts/get_variables.bat
	scripts/windows/coco-dev-setup/batch/scripts/get_variables.ps1
	scripts/windows/coco-dev-setup/batch/scripts/github_setup.bat
	scripts/windows/coco-dev-setup/batch/scripts/npm_and_brunch_setup.bat
	scripts/windows/coco-dev-setup/batch/scripts/open_readme.bat
	scripts/windows/coco-dev-setup/batch/scripts/open_text_file.bat
	scripts/windows/coco-dev-setup/batch/scripts/print_dashed_seperator.bat
	scripts/windows/coco-dev-setup/batch/scripts/print_exit.bat
	scripts/windows/coco-dev-setup/batch/scripts/print_file.bat
	scripts/windows/coco-dev-setup/batch/scripts/print_finished_header.bat
	scripts/windows/coco-dev-setup/batch/scripts/print_github_header.bat
	scripts/windows/coco-dev-setup/batch/scripts/print_header.bat
	scripts/windows/coco-dev-setup/batch/scripts/print_info.bat
	scripts/windows/coco-dev-setup/batch/scripts/print_install_header.bat
	scripts/windows/coco-dev-setup/batch/scripts/print_license.bat
	scripts/windows/coco-dev-setup/batch/scripts/print_npm_and_brunch_header.bat
	scripts/windows/coco-dev-setup/batch/scripts/print_seperator.bat
	scripts/windows/coco-dev-setup/batch/scripts/print_tips.bat
	scripts/windows/coco-dev-setup/batch/scripts/run_script.bat
	scripts/windows/coco-dev-setup/batch/scripts/setup.bat
	scripts/windows/coco-dev-setup/batch/scripts/sign_license.bat
	scripts/windows/coco-dev-setup/batch/setup.bat
Merge branch 'master' of https://github.com/codecombat/codecombat
Merge branch 'master' of https://github.com/codecombat/codecombat
Merge branch 'master' of https://github.com/codecombat/codecombat

Conflicts:
	scripts/windows/coco-dev-setup/batch/localisation/zh-HANS.coco
Update article model
Update ru.coffee
Work on wizard settings
Work on create_new modal
Work on fork modal
Work on revert, save modal
Work on thang tab
Fix crlf
Sync i18n
Bunch of server changes, mainly adding all the JSON schema validation and fixing tests.
Turned off sendwithus API during testing.
Made the server side of the patch system.
Added jsondiffpatch to the client. Bower update everyone!