Fixed some bugs from the migration from _.cloneDeep to $.extend
Merge branch 'master' of https://github.com/codecombat/codecombat