moved the entity controllers into the main app.

Trust me, I know what I'm doing.
Merge remote-tracking branch 'origin/master' into feature-ccase-com-layer-cleanup
Removed remaining reliance on client_info.

Also, removed some dead entity engine code.