platform build.xml VS2013
NPE was detected
Merge remote-tracking branch 'origin/master' into windows

Conflicts:
	platform_build/windows_ant/build.xml
	src/java/org/lwjgl/opengl/WindowsDisplay.java