Updated project files
Merge branch 'master' of https://github.com/open-ephys/GUI
Fixed merge conflicts in BinaryData and OS X project
Removed output message from LfpDisplayNode::setParameter