Add/Remove units to/from cities as citizens?

[thadian]

I would like to give EVERY unit the option of "join city" - and every citizen to have the "Leave City" option.

All i need is this function on units, and i will be happy.

I will deal with the rest of it later, for now this function is my concern.