Add extra debug output to LfpDisplayCanvas
Merge branch 'master' of https://github.com/open-ephys/GUI
Change bitVolts for aux channels in RHD2000Thread
Set Rhythm ADC channels to record by default
Change 'True' to 'true'
Fix audio output status being lost when updating chain
Merge branch 'master' of github.com:open-ephys/GUI

Conflicts:
	Source/Processors/GenericProcessor/GenericProcessor.cpp
Set return value in FileReader::setFile
Merge branch 'master' of github.com:open-ephys/GUI
Fix sample files polarity
Fixed ECube voltage ranges for headstage, analog and digital inputs
Enabled propagation of ECube channel types to processors down the chain
Merge branch 'master' of https://github.com/open-ephys/GUI.git
Fixed a bug with ecube timestamps for Panel Analog Input
Add debug macro to replicate headstage input
Fix AUX channels getting incorrect type
Fix wrong channel names being set when creating RHD canvas
Remove debug define from build on VS2012
Update GUI version to 3.3
add Ecube compile settings
Merge from GitHub