beremiz

'Merged' URI editor dialog and Discovery dialog, also clean up related code
<xsd:element name="Generic">
<xsd:complexType>
%(toolchain_makefile)s
</xsd:complexType>
</xsd:element>