#73 no calculated data inside the API:
I cleaned up the entities and marked fields that have to be moved away as deprecated.
Also added the story number to related TODO comments.
Merge remote-tracking branch 'origin/master'