Merge remote-tracking branch 'tikhomirov/osx_joystick'

Conflicts:
	.gitignore
	src/cocoa_init.m

src/cocoa_init.m

@@ -230,6 +230,8 @@ int _glfwPlatformInit(void)
     _glfwPlatformGetGammaRamp(&_glfwLibrary.originalRamp);
     _glfwLibrary.currentRamp = _glfwLibrary.originalRamp;
 
+    _glfwInitJoysticks();
+
     return GL_TRUE;
 }
 
@@ -251,6 +253,8 @@ int _glfwPlatformTerminate(void)
     [_glfwLibrary.NS.autoreleasePool release];
     _glfwLibrary.NS.autoreleasePool = nil;
 
+    _glfwTerminateJoysticks();
+
     return GL_TRUE;
 }