Fixed #836
Merge branch 'master' of https://github.com/codecombat/codecombat
Fixed #813 (sort of).
Merge branch 'master' of https://github.com/codecombat/codecombat
Improved simulation leaderboard performance
Merge pull request #846 from codecombat/master

Master into production