Merge branch 'master' of https://github.com/AlincoRecoders/AlincoVVS

Conflicts:
	AutoWireupExamplePlugin/AlincoVVSDefinitions.cs
	AutoWireupExamplePlugin/CompareFunctions.cs
	AutoWireupExamplePlugin/ControlEvents.cs
	AutoWireupExamplePlugin/Data/DataClasses.cs
	AutoWireupExamplePlugin/Data/Enum.cs
	AutoWireupExamplePlugin/Data/IdentifiedObject.cs
	AutoWireupExamplePlugin/DataHandlers/Disk.cs
	AutoWireupExamplePlugin/HUD/LootHud.cs
	AutoWireupExamplePlugin/HUD/Plugin.Hud.cs
	AutoWireupExamplePlugin/InitializingFunctions.cs
	AutoWireupExamplePlugin/Persistent/Settings.cs
	AutoWireupExamplePlugin/Plugin.Actions.cs
	AutoWireupExamplePlugin/Plugin.NotifyObject.cs
	AutoWireupExamplePlugin/Plugin.Public.cs
	AutoWireupExamplePlugin/Plugin.View.cs
	AutoWireupExamplePlugin/TextCommands.cs
Merge branch 'master' of https://github.com/AlincoRecoders/AlincoVVS

Conflicts:
	AutoWireupExamplePlugin/ControlEvents.cs
	AutoWireupExamplePlugin/HUD/LootHud.cs
	AutoWireupExamplePlugin/InitializingFunctions.cs