Resolve merge conflicts

Builds/Linux/Makefile

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

Builds/VisualStudio2012/open-ephys.vcxproj

Builds/VisualStudio2012/open-ephys.vcxproj.filters

Builds/VisualStudio2013/open-ephys.sln

Builds/VisualStudio2013/open-ephys.vcxproj

Builds/VisualStudio2013/open-ephys.vcxproj.filters

Source/Processors/ArduinoOutput/ArduinoOutput.cpp

Source/Processors/ArduinoOutput/ArduinoOutput.h

Source/Processors/AudioNode/AudioNode.cpp

Source/Processors/AudioNode/AudioNode.h

...ce/Processors/AudioResamplingNode/AudioResamplingNode.cpp

Source/Processors/AudioResamplingNode/AudioResamplingNode.h

Source/Processors/Channel/Channel.cpp

Source/Processors/Channel/Channel.h

Source/Processors/ChannelMappingNode/ChannelMappingNode.cpp

Source/Processors/ChannelMappingNode/ChannelMappingNode.h

Source/Processors/DataThreads/DataThread.h

Source/Processors/DataThreads/EcubeThread.cpp

Source/Processors/DataThreads/EcubeThread.h