#188: Facility Map & Contact Gap
Merge branch '188'
Merge branch 'master' into test