Council adopts new master plan