Updating local fork with changes from codecombat

Additionally merging my own translations from the patch-1 branch.