Merge remote-tracking branch 'origin/Tracey' into WhatDoesTheFoxSay

Conflicts:
	CapGUI/Parsing/SocketReader.cs
	CapGUI/SocketDragDropTarget.cs
fixed merge
Block Parse config
Merge remote-tracking branch 'origin/Tracey' into WhatDoesTheFoxSay
fixing output
trying to load block xml
Merge remote-tracking branch 'origin/master' into WhatDoesTheFoxSay

Conflicts:
	CapGUI/Parsing/CodeParser.cs
	CapGUI/Parsing/SocketReader.cs
git merge