Merge branch 'fix_resource_shift_listing' into 'develop'

Fix city_hall_id on resource shift policy

See merge request !60
3 jobs for develop in 2 minutes and 15 seconds (queued for 2 seconds)