Merge branch 'master' into NDK

Conflicts:
	include/Nazara/Core/Algorithm.inl
	include/Nazara/Core/ByteArray.hpp
	include/Nazara/Math/Algorithm.inl
	src/Nazara/Graphics/SkyboxBackground.cpp

Former-commit-id: 42f52f71989fa805f69527fd07edb8405df06566

src/Nazara/Utility/Formats/FreeTypeLoader.cpp

@@ -279,7 +279,7 @@ namespace
 			bool SetFile(const NzString& filePath)
 			{
 				std::unique_ptr<NzFile> file(new NzFile);
-				if (!file->Open(filePath, NzFile::ReadOnly))
+				if (!file->Open(filePath, nzOpenMode_ReadOnly))
 				{
 					NazaraError("Failed to open stream from file: " + NzError::GetLastError());
 					return false;