Updated some $attr, $val, and $prop calls.
Merge branch 'master' of https://github.com/codecombat/codecombat