beremiz

'Merged' URI editor dialog and Discovery dialog, also clean up related code
#State Text Reference;;;;;;;
#Reference Number;Text 1;Text 2;Text 3;Text 4;Text 5;...;Text n