Conflicts:
	Builds/Linux/Makefile
	Builds/MacOSX/open-ephys.xcodeproj/project.pbxproj
	Source/Main.cpp
	Source/Processors/Channel.cpp
	Source/Processors/GenericProcessor.h
	Source/Processors/ProcessorGraph.cpp
	Source/Processors/RecordNode.cpp
	Source/Processors/RecordNode.h
	Source/Processors/SpikeDisplayNode.cpp
	Source/Processors/SpikeDisplayNode.h
	Source/Processors/Utilities/RecordControl.cpp
	Source/Processors/Visualization/DataWindow.cpp