Merge branch 'master' of https://github.com/open-ephys/GUI

Builds/Linux/Makefile

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

...ys.xcodeproj/project.xcworkspace/contents.xcworkspacedata

...cuserdata/Josh.xcuserdatad/UserInterfaceState.xcuserstate

.../xcuserdata/Josh.xcuserdatad/WorkspaceSettings.xcsettings

...xcuserdata/Josh.xcuserdatad/xcschemes/open-ephys.xcscheme

...rdata/Josh.xcuserdatad/xcschemes/xcschememanagement.plist

...erdata/ryan.xcuserdatad/xcdebugger/Breakpoints.xcbkptlist

Builds/VisualStudio2010/open-ephys.vcxproj

Builds/VisualStudio2010/open-ephys.vcxproj.filters

Builds/VisualStudio2012/open-ephys.vcxproj

Builds/VisualStudio2012/open-ephys.vcxproj.filters

JuceLibraryCode/BinaryData.cpp

Source/Processors/ChannelMappingNode.cpp

Source/Processors/ChannelMappingNode.h

Source/Processors/Editors/ChannelMappingEditor.h

Source/Processors/Editors/ChannelSelector.cpp

Source/Processors/Editors/GenericEditor.cpp

Source/Processors/Editors/GenericEditor.h

Source/Processors/Editors/SpikeDetectorEditor.cpp