School and neighbour centre in master plan for Laffing Waters