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

Builds/Linux/Makefile

Builds/Linux/build/data_stream_16ch_theta

Builds/MacOSX/open-ephys.xcodeproj/project.pbxproj

Builds/VisualStudio2010/open-ephys.vcxproj

Builds/VisualStudio2010/open-ephys.vcxproj.filters

Source/Processors/ArduinoOutput.cpp

Source/Processors/ArduinoOutput.h

Source/Processors/AudioResamplingNode.cpp

Source/Processors/AudioResamplingNode.h

Source/Processors/Channel.cpp

Source/Processors/DataThreads/DataBuffer.cpp

Source/Processors/DataThreads/FPGAThread.cpp

Source/Processors/DataThreads/FileReaderThread.cpp

Source/Processors/Editors/FPGAOutputEditor.cpp

Source/Processors/Editors/FPGAOutputEditor.h

Source/Processors/Editors/GenericEditor.cpp

Source/Processors/Editors/GenericEditor.h

Source/Processors/Editors/ParameterEditor.cpp

Source/Processors/Editors/ParameterEditor.h

Source/Processors/Editors/ResamplingNodeEditor.cpp