Merge pull request #628 from codecombat/master

Quick queue fix
Merge pull request #633 from codecombat/master

Master into production
Merge pull request #635 from codecombat/master

Master into production
Merge branch 'master' into production
Merge branch 'master' into production
Merge branch 'master' into production
Merge branch 'master' into production
Merge branch 'master' into production
Merge branch 'master' into production
Merge branch 'master' into production
Merge branch 'master' into production
merged
Merge branch 'master' into production
Merge branch 'master' into production
Merge branch 'master' into production
Merge branch 'master' into production
Merge branch 'master' into production
Merge branch 'master' into production
Merge branch 'master' into production
Merge pull request #780 from codecombat/master

Merge master into production