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
Add extra checks in RHD2164 delay scan
Merge remote-tracking branch 'upstream/master'

Conflicts:
	Builds/VisualStudio2012/open-ephys.vcxproj