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

Builds/MacOSX/Info.plist

Builds/VisualStudio2012/open-ephys.vcxproj

Builds/VisualStudio2012/resources.rc

JuceLibraryCode/JuceHeader.h

Source/Processors/Editors/AudioEditor.cpp

Source/Processors/Editors/ChannelSelector.cpp

Source/Processors/Editors/GenericEditor.cpp

Source/Processors/Editors/GenericEditor.h

Source/Processors/Editors/SpikeDetectorEditor.cpp

Source/Processors/FilterNode.cpp

Source/Processors/GenericProcessor.cpp

Source/Processors/GenericProcessor.h

Source/Processors/ProcessorGraph.cpp

Source/Processors/SpikeDetector.cpp

Source/Processors/SpikeDetector.h

Source/UI/ControlPanel.cpp

Source/UI/GraphViewer.cpp

open-ephys.jucer