Merge branch 'master' of https://github.com/open-ephys/GUI

Resources/DataFiles/data_stream_16ch_cortex

Resources/DataFiles/data_stream_sine_wave

Source/Processors/Channel.cpp

Source/Processors/Channel.h

Source/Processors/DataThreads/DataThread.h

Source/Processors/DataThreads/RHD2000Thread.cpp

Source/Processors/DataThreads/RHD2000Thread.h

...ce/Processors/DataThreads/rhythm-api/rhd2000datablock.cpp

Source/Processors/Editors/ChannelMappingEditor.h

Source/Processors/Editors/ChannelSelector.cpp

Source/Processors/Editors/GenericEditor.cpp

Source/Processors/Editors/GenericEditor.h

Source/Processors/Editors/RHD2000Editor.cpp

Source/Processors/Editors/RHD2000Editor.h

Source/Processors/Editors/ResamplingNodeEditor.h

Source/Processors/Editors/SpikeDetectorEditor.cpp

Source/Processors/Editors/SpikeDisplayEditor.cpp

Source/Processors/Editors/VisualizerEditor.cpp

Source/Processors/FileReader.cpp

Source/Processors/FileReader.h