Merge from GitHub

Builds/Linux/Makefile

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

Builds/VisualStudio2012/open-ephys.sln

Builds/VisualStudio2012/open-ephys.vcxproj

Builds/VisualStudio2012/open-ephys.vcxproj.filters

Builds/VisualStudio2013/open-ephys.vcxproj

Builds/VisualStudio2013/open-ephys.vcxproj.filters

Resources/windows-libs/HDF5/lib/x64/hdf5.lib

Resources/windows-libs/HDF5/lib/x64/hdf5_cpp.lib

Resources/windows-libs/HDF5/lib/x64/szip.lib

Resources/windows-libs/HDF5/lib/x64/zlib.lib

Resources/windows-libs/HDF5/lib/x86/hdf5.lib

Resources/windows-libs/HDF5/lib/x86/hdf5_cpp.lib

Resources/windows-libs/HDF5/lib/x86/szip.lib

Resources/windows-libs/HDF5/lib/x86/zlib.lib

Source/Processors/CAR/CAR.cpp

Source/Processors/CAR/CAR.h

Source/Processors/DataThreads/EcubeThread.cpp

...ce/Processors/Editors/PeriStimulusTimeHistogramEditor.cpp

Source/Processors/Editors/PeriStimulusTimeHistogramEditor.h