Fixed saving user properties. Mentioned in #958 (was the source of the conflict error) but I don't think is related.
Merge branch 'master' of https://github.com/codecombat/codecombat