mac port to GLFW
Merge branch 'dev'