Merge pull request #183 from codecombat/master

Merging a few days of progress into the production branch
Merge branch 'master' into production
Merge branch 'master' into production
Merge branch 'master' into production
Merge branch 'master' into production
Merge pull request #244 from codecombat/master

Merge production into master for deploy
Merge pull request #263 from codecombat/master

Merging into production
Merge pull request #269 from codecombat/master

Merged progress 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
Reverting back to super log mode cause it stopped working.
Merge branch 'production'