Merge remote-tracking branch 'cocomaster/master'
ru.cofee small changes
Merge remote-tracking branch 'cocomaster/master'
Temp fix for the number of thang types exploding recently.
Update fa.coffee

I'll translate the rest soon
Consolidated text on contribute and removed padding to make the
page not as spread out.

Text on the contribute page was a redundant copy of each class'
contribution page. The summary text was shortened and some vertical
padding was removed.
60 FPS and support for independent world/surface frame rates.
Merge branch 'master' of https://github.com/codecombat/codecombat
Merge branch 'master' of git://github.com/iamawong/codecombat into iamawong-master
Merge remote-tracking branch 'origin/master'
Updating i18n tags for new contribute summaries.
Merge pull request #381 from alireza68/patch-1

Update fa.coffee
Merge pull request #372 from QelioX/patch-1

ru.cofee small changes
Added titles and descriptions for schema
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