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

Intan2132_16chx2_map_reordered

Open-Ephys GUI configuration file for loading up 2 headstages intan2132_16ch (part #C3334) connected on A and B port with channel mapping reordered on the acquisition board.

Intan2132_16chx1_map_reordered

Open-Ephys GUI configuration file to load the correct channel mapping for intan2132 16ch (part #C3334)