Merge branch 'master' into production
Merge branch 'production' of https://github.com/codecombat/codecombat into production