Cat and Max conspire to set Sami and Yasmin up. Katie helps Nikki plan a surprise for Conrad while John thinks about popping Tanya the question! Jane returns and PC Will visits the Costello's.