Merge branch 'fix_resource_type_listing' into 'develop'

Fix city_hall_id comparison on resource type policy

See merge request !58
3 jobs for develop in 3 minutes and 46 seconds (queued for 7 seconds)