Merge branch 'master' of https://github.com/open-ephys/GUI.git

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/DataFiles/chirps_16_channels_At40kHz.kwd

Resources/DataFiles/data_stream_16ch_cortex.kwd

Resources/DataFiles/data_stream_16ch_hippocampus.kwd

Resources/DataFiles/data_stream_sine_wave.kwd

...ce/Processors/ChannelMappingNode/ChannelMappingEditor.cpp

Source/Processors/DataThreads/RHD2000Editor.cpp

Source/Processors/DataThreads/RHD2000Editor.h

Source/Processors/DataThreads/RHD2000Thread.cpp

Source/Processors/DataThreads/RHD2000Thread.h

Source/Processors/Editors/GenericEditor.h

Source/Processors/FileReader/FileReader.cpp

Source/Processors/FileReader/FileReader.h

Source/Processors/FileReader/FileReaderEditor.cpp