Merge master branch

...cuserdata/Josh.xcuserdatad/UserInterfaceState.xcuserstate

Source/Processors/ChannelMappingNode.cpp

Source/Processors/DataThreads/DataThread.cpp

Source/Processors/DataThreads/FPGAThread.cpp

Source/Processors/DataThreads/FileReaderThread.cpp

Source/Processors/DataThreads/RHD2000Thread.cpp

Source/Processors/DataThreads/RHD2000Thread.h

Source/Processors/Editors/ChannelMappingEditor.cpp

Source/Processors/Editors/ChannelMappingEditor.h

Source/Processors/Editors/ChannelSelector.cpp

Source/Processors/Editors/ChannelSelector.h

Source/Processors/Editors/FileReaderEditor.cpp

Source/Processors/Editors/FileReaderEditor.h

Source/Processors/Editors/FilterEditor.cpp

Source/Processors/Editors/FilterEditor.h

Source/Processors/Editors/GenericEditor.cpp

Source/Processors/Editors/ParameterEditor.cpp

Source/Processors/Editors/PhaseDetectorEditor.cpp

Source/Processors/Editors/PhaseDetectorEditor.h

Source/Processors/Editors/PulsePalOutputEditor.cpp