OS X exe
Merge branch 'origin/master'
updated xcode projects