Fixes for Macs on SG2
Merge branch 'master' of https://github.com/UMLComputerGraphics/GraphicsProject