finished socket reader
reader touch ups
Merge remote-tracking branch 'origin/master' into Tracey
Block parse

you know what we did
Merge remote-tracking branch 'origin/Tracey' into WhatDoesTheFoxSay

Conflicts:
	CapGUI/Parsing/SocketReader.cs
	CapGUI/SocketDragDropTarget.cs