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

.gitignore

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

Builds/VisualStudio2012/open-ephys.sln

Builds/VisualStudio2012/open-ephys.vcxproj

JuceLibraryCode/BinaryData.cpp

Resources/DLLs/Win64/okFrontPanel.dll

Resources/DLLs/okFrontPanel.dll

Source/Processors/DataThreads/FPGAThread.cpp

Source/Processors/Editors/FilterEditor.cpp

Source/Processors/FileReader.cpp

Source/Processors/SourceNode.h

open-ephys.jucer

windeps/README.rst

windeps/dll/freetype6.dll

windeps/dll/ftgl.dll

windeps/dll/ftlang.dll

windeps/dll/ftserui2.dll

windeps/dll/glew32.dll

windeps/dll/libftdi.dll

windeps/dll/libusb0.dll