GPII-151

Now that FLUID-4907 is in, this pull request updates to the latest master version of Infusion. The Discovery Tool has been updated to work the changes to UIO and UIE, but not to use the schema.

http://issues.gpii.net/browse/GPII-151