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/Renderer/Context.hpp

@@ -35,14 +35,20 @@ class NAZARA_RENDERER_API NzContext : public NzRefCounted
 		~NzContext();
 
 		bool Create(const NzContextParameters& parameters = NzContextParameters());
+
 		void Destroy();
 
+		void EnableVerticalSync(bool enabled);
+
 		const NzContextParameters& GetParameters() const;
+
 		bool IsActive() const;
+
 		bool SetActive(bool active) const;
 		void SwapBuffers();
 
 		static bool EnsureContext();
+
 		static const NzContext* GetCurrent();
 		static const NzContext* GetReference();
 		static const NzContext* GetThreadContext();