Citizen

Moved citizen desk related commits from devel branch to citizen branch (created from master)