Merge branch 'master' into NDK

Conflicts:
	build/scripts/module/renderer.lua
	build/scripts/module/utility.lua
	include/Nazara/Renderer/OpenGL.hpp
	src/Nazara/Core/String.cpp

Former-commit-id: 0a8054be56f01b12c604c88b829cb10b490a9d6f

include/Nazara/Utility/WindowHandle.hpp

@@ -13,8 +13,9 @@
 // http://msdn.microsoft.com/en-us/library/aa383751(v=vs.85).aspx
 typedef void* NzWindowHandle;
 #elif defined(NAZARA_PLATFORM_LINUX)
+#include <xcb/xcb.h>
 // http://en.wikipedia.org/wiki/Xlib#Data_types
-typedef unsigned long NzWindowHandle;
+using NzWindowHandle = xcb_window_t;
 #else
 	#error Lack of implementation: WindowHandle
 #endif