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

.gitignore

Builds/Linux/Makefile

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

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

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

JuceLibraryCode/JuceHeader.h

Source/Processors/ArduinoOutput.cpp

Source/Processors/ArduinoOutput.h

Source/Processors/AudioNode.cpp

Source/Processors/Channel.cpp

Source/Processors/Channel.h

Source/Processors/DataThreads/FPGAThread.cpp

Source/Processors/Editors/RecordControlEditor.cpp

Source/Processors/Editors/RecordControlEditor.h

Source/Processors/FPGAOutput.cpp

Source/Processors/FPGAOutput.h