Include type in serialization.
Merge pull request #656 from code-dot-org/fix-sti-json

Include type in serialization.