Conflicts:
	.gitignore
	Builds/Linux/Makefile
	Builds/MacOSX/open-ephys.xcodeproj/project.pbxproj
	Builds/VisualStudio2013/open-ephys.vcxproj
	Builds/VisualStudio2013/open-ephys.vcxproj.filters
	Source/CoreServices.h
	Source/Processors/PSTH/PeriStimulusTimeHistogramEditor.cpp