Merge pull request #326 from codecombat/master

Merging master into production