Changes to LfpDisplay scrolling
Merge branch 'master' of https://github.com/open-ephys/GUI
Merge branch 'master' of https://github.com/open-ephys/GUI
Merge branch 'master' of https://github.com/open-ephys/GUI
Replace libokFrontPanel with Ubuntu version
VS2013 updates
Fix ADC range problems with RHD2000Thread

Conflicts:
	Builds/VisualStudio2012/open-ephys.vcxproj
Trying to track down weird behavior when adding ADC channels
Fix platform toolset for VS2012
Fixed gain assignment on FPGA settings
Fixed a few memory leaks
Added HDF5 DLLs compatible with Visual Studio 2013
Cleaned up .gitignore wrt VS2013 support
Calibrate ADC channels
Add support for 64-bit event codes
Added HDF5 DLLs that are compatible with Visual Studio 2013
Merge branch 'master' of https://github.com/open-ephys/GUI.git
Change default display settings for LfpDisplayCanvas
Merge branch 'master' of https://github.com/open-ephys/GUI
Add 0.4V offset to ADC channels
Fix RecordEngines not getting correct timestamp when recording starts
Add xml index file to Open Ephys recording format continuous data