Merge branch 'pr/200'

Conflicts:
	app/locale/fr.coffee
Merge branch 'pr/190'

Conflicts:
	app/locale/fr.coffee
Revert "Merge branch 'pr/190'"

This reverts commit 457accf7296ddaf667bb67c4f58f9b684b99dce2, reversing
changes made to 9df9f75f64157e7cd20c995a575037128af798c1.
Merge branch 'pr/197'

Conflicts:
	app/locale/fr.coffee
Fixed bug with team assignments and spell permissions.
spelling and grammar mistakes - fr.coffee

Just a correction of what really hurt the eye
Merge branch 'master' into production
Resolved issue #160
Hotfix for previous commit, forgot to uncommit some stuff
Logs now a warning in the console to give user the feedback that there are no programmable thangs which makws the level unplayable.
Merge https://github.com/codecombat/codecombat
Merge pull request #221 from GlenDC/master

Fixed issue #160 and updated my repository
Merge pull request #220 from Elfisen/patch-2

spelling and grammar mistakes - fr.coffee
Couple fixes for small errors when running with no Programmables.
Fixed home page wizard scale.
changed sass-brunch version requirement in package.json to allow for easier environment installation
Merge pull request #224 from zachster01/master

corrected sass-brunch release requirement
Update ru.coffee
Updated Turkish translation

Updated Turkish translation
Merge pull request #226 from wakeup/patch-1

Updated Turkish translation