Update OSX projects.
Update gitignore.
Merge branch 'develop'