Merge branch 'testing' into development

Builds/Linux/Makefile

Builds/MacOSX/OpenEphys.xcworkspace/contents.xcworkspacedata

...OSX/Plugins/NWBFormat/NWBFormat.xcodeproj/project.pbxproj

Builds/VisualStudio2012/open-ephys.vcxproj

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

...ualStudio2013/Plugins/NetworkEvents/NetworkEvents.vcxproj

...lStudio2013/Plugins/Phase Detector/Phase Detector.vcxproj

Builds/VisualStudio2013/Plugins/Plugins.sln

...lStudio2013/Plugins/PulsePalOutput/PulsePalOutput.vcxproj

...ualStudio2013/Plugins/RecordControl/RecordControl.vcxproj

Builds/VisualStudio2013/Plugins/Rectifier/Rectifier.vcxproj

.../VisualStudio2013/Plugins/SerialInput/SerialInput.vcxproj

.../VisualStudio2013/Plugins/SpikeSorter/SpikeSorter.vcxproj

Builds/VisualStudio2013/open-ephys.vcxproj

Projucer/Builds/LinuxMakefile/Makefile

open-ephys.jucer