The Jerusalem Master Plan: Planning into the conflict