Entity class improvments.
Merge branch 'master' of github.com:conradkleinespel/deck