xcode project changes

The tweaks to header files and library files necessary to run
Commit
Revert "Commit"

This reverts commit 46a11abab9839a0672cfa887c611ef9fa8e57b01, reversing
changes made to 02637b37e2f61afeb66230ebea84a7763dab9e8b.
Revert "xcode project changes"

This reverts commit 02637b37e2f61afeb66230ebea84a7763dab9e8b.
Pull from Github

ing branch 'upstream/master'

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
xCode Project stuff
CatchUpFromWeb
Fixes splitter saving hang
Merge pull request #1 from open-ephys/master

Catch Up
Merge
Merge pull request #38 from interpretivechaos/master

Fixes Splitter/Merger Saving Hang