Fixing a typo in the CLA
Merge branch 'master' of https://github.com/codecombat/codecombat
Added additional names for units.
Fixed account recovery on dev server.
Set up portrait uploading for thangs.
Increase infinite loop timeout wait slightly to bandage #81.