Merge pull request #326 from codecombat/master

Merging master into production
Merge branch 'master' into production
Merge branch 'master' into production
Merge branch 'master' into production
Merge pull request #359 from codecombat/master

Merge master into production
Merge pull request #363 from codecombat/master

Merge master into production
Merge pull request #366 from codecombat/master

Merge master into production
Merge pull request #367 from codecombat/master

Manually specified tv4 version to fix npm checksum error
Merge branch 'master' into production
Merge branch 'master' into production
Merge branch 'master' into production
Merge branch 'master' into production
Temp fix for the number of thang types exploding recently.
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge branch 'master' of https://github.com/codecombat/codecombat
Saving some uncommented i18n tags.
Exported a few new en i18n tags to the other languages.
Merge branch 'master' of https://github.com/codecombat/codecombat
Added sessionID and userID to session schema