Citizen

Copied from devel branch to citizen branch the user show/hide related functionality