OS X changes
Allow LfpDisplay to show actual channel names
Switch order of channels in RHD2000Thread so all neural data channels are grouped together
In the process of making it possible to provide custom names for channels
OS X changes
Merge branch 'master' of https://github.com/open-ephys/GUI
More changes to channel naming code
Fix logic of threshold slider
Names of SpikePlots now reflect actual electrode names
Threshold slider can now be used to filter spikes
SpikePlots can now open their own .spikes files when recording begins
Spikes are now written to disk through the SpikeDisplayCanvas
Replace Digital Ref with Channel Map
Fix logic of ChannelMappingEditor buttons
ChannelMappingNode works now
slightly modified phasedetecor behaviour
Skip this commit to avoid changing current behaviour
Added simple event display
Merge branch 'master' of github.com:open-ephys/GUI

Conflicts:
	Source/Processors/Visualization/LfpDisplayCanvas.h
Fix issues with saving spikes
Add sample rate to .spikes header