Added the Makefile to gitignore and updated the xcode project.
Merge remote-tracking branch 'origin/develop' into develop