Guildford town centre masterplan including 2,600 new homes gets £3m for next stage