Update osx proj for osx to use native opengl and hacked up freeglut
Merge remote-tracking branch 'origin/master'