Merge branch 'master' into NDK

Conflicts:
	include/Nazara/Core/ConditionVariable.hpp

Former-commit-id: 84320f0a55ae9d8f80ff5211d30d99184c7b4213

include/Nazara/Core/HardwareInfo.hpp

@@ -20,6 +20,7 @@ class NAZARA_CORE_API NzHardwareInfo
 		static unsigned int GetProcessorCount();
 		static nzProcessorVendor GetProcessorVendor();
 		static NzString GetProcessorVendorName();
+		static nzUInt64 GetTotalMemory();
 
 		static bool HasCapability(nzProcessorCap capability);