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

Builds/Linux/Makefile

Builds/MacOSX/Info.plist

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

Builds/VisualStudio2012/open-ephys.vcxproj

Builds/VisualStudio2012/resources.rc

Builds/VisualStudio2013/open-ephys.vcxproj

Builds/VisualStudio2013/resources.rc

JuceLibraryCode/JuceHeader.h

Resources/Configs/NN_4s2tt_config.xml

Source/Plugins/CAR/CAR.h

Source/Plugins/CAR/CAREditor.cpp

Source/Plugins/KWIKFormat/RecordEngine/HDF5Recording.cpp

Source/Plugins/LfpDisplayNodeBeta/LfpDisplayCanvas.cpp

Source/Plugins/LfpDisplayNodeBeta/LfpDisplayCanvas.h

Source/Processors/AudioNode/AudioEditor.cpp

Source/Processors/FileReader/FileReaderEditor.cpp

Source/UI/GraphViewer.cpp

open-ephys.jucer