Couple tweaks to the cocosprite for effect marks.
Merge branch 'master' of https://github.com/codecombat/codecombat
More fixes for empty string array serialization.
Fixed the effect marks so they properly go away.
Fixed CocoSprite getOffset to not apply scale to registration points.
Fixed a couple of the bugs with marks.
Merge remote-tracking branch 'origin/master'