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

.gitignore

Builds/MacOSX/OpenEphys.xcworkspace/contents.xcworkspacedata

...OpenEphys.xcworkspace/xcshareddata/xcschemes/All.xcscheme

Builds/MacOSX/Plugins/Config/Env.xcconfig.example

Builds/MacOSX/Plugins/Config/Plugin.xcconfig

...entBroadcaster/EventBroadcaster.xcodeproj/project.pbxproj

...X/Plugins/KWIKFormat/KWIKFormat.xcodeproj/project.pbxproj

...playNodeBeta/LfpDisplayNodeBeta.xcodeproj/project.pbxproj

...ins/NetworkEvents/NetworkEvents.xcodeproj/project.pbxproj

...Plugins/SpikeRaster/SpikeRaster.xcodeproj/project.pbxproj

Builds/MacOSX/Plugins/SpikeRaster/SpikeRaster/Info.plist

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

...isualStudio2013/Plugins/BinaryWriter/BinaryWriter.vcxproj

...dio2013/Plugins/BinaryWriter/BinaryWriter.vcxproj.filters

...tudio2013/Plugins/LFP_Viewer_Beta/LFP_Viewer_Beta.vcxproj

...3/Plugins/LFP_Viewer_Beta/LFP_Viewer_Beta.vcxproj.filters

...ds/VisualStudio2013/Plugins/PCIeRhythm/PCIeRhythm.vcxproj

...lStudio2013/Plugins/PCIeRhythm/PCIeRhythm.vcxproj.filters

Builds/VisualStudio2013/Plugins/Plugins.sln

.../VisualStudio2013/Plugins/SpikeRaster/SpikeRaster.vcxproj