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/Core/String.hpp

@@ -180,10 +180,10 @@ class NAZARA_CORE_API NzString : public NzHashable
 		const char* end() const;
 		void push_front(char c);
 		void push_back(char c);
-		/*char* rbegin();
-		const char* rbegin() const;
-		char* rend();
-		const char* rend() const;*/
+		//char* rbegin();
+		//const char* rbegin() const;
+		//char* rend();
+		//const char* rend() const;
 
 		typedef const char& const_reference;
 		typedef char* iterator;