Integrated GadgetTypes and also fixed up a few minor issues with the xml reader accessing non-public classes
Merge origin/master
Made minor repairs to TechLevel xml parsing