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.vcxproj
	Builds/VisualStudio2013/open-ephys.vcxproj.filters
	Source/CoreServices.cpp
	Source/Plugins/ArduinoOutput/ArduinoOutput.cpp
	Source/Plugins/EcubeSource/EcubeThread.h
	Source/Plugins/NetworkEvents/NetworkEvents.cpp
	Source/Plugins/RecordControl/RecordControl.h
	Source/Processors/DataThreads/RhythmNode/RHD2000Thread.cpp
	Source/Processors/DataThreads/RhythmNode/RHD2000Thread.h
	Source/Processors/DataThreads/RhythmNode/rhythm-api/rhd2000evalboard.cpp
	Source/Processors/DataThreads/RhythmNode/rhythm-api/rhd2000evalboard.h
	Source/Processors/ProcessorGraph/ProcessorGraph.cpp
	Source/UI/ProcessorList.cpp
	open-ephys.jucer