Adds missing files to OSX project
Merge remote-tracking branch 'origin/develop'