Happy status needs to draw modifiers; correct citizen counts for modifiers

[fire-eggs]

Note modifiers on right side.

The layers are:

1. Unmodified citizen view
2. Impact of luxuries
3. Temple/cathedral/Colosseum impact
4. Martial law impact [question: are the actual units drawn here?]
5. Wonders impact

Current code doesn't draw correct numbers of different types of citizens, because the City class only provides access to the "final" numbers.