Merge branch 'development' into newChannelObjects

Builds/Linux/Makefile

Builds/Linux/Makefile.plugins

Builds/Linux/setup.sh

Builds/MacOSX/Info-App.plist

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

Builds/VisualStudio2012/open-ephys.vcxproj

Builds/VisualStudio2012/resources.rc

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

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

Builds/VisualStudio2013/Plugins/Plugin_Debug32.props

Builds/VisualStudio2013/Plugins/Plugin_Debug64.props

Builds/VisualStudio2013/Plugins/Plugin_Release32.props

Builds/VisualStudio2013/Plugins/Plugin_Release64.props

Builds/VisualStudio2013/open-ephys.sln

Builds/VisualStudio2013/open-ephys.vcxproj

Builds/VisualStudio2013/resources.rc

JuceLibraryCode/JuceHeader.h

Source/Plugins/PCIeRhythm/Makefile

Source/Plugins/PCIeRhythm/OpenEphysLib.cpp

Source/Plugins/PCIeRhythm/RHD2000Editor.cpp