Merge branch 'develop' into feature/cubiquity-version

Conflicts:
	library/PolyVoxCore/include/PolyVoxCore/MarchingCubesSurfaceExtractor.inl

library/PolyVoxCore/source/Impl/Timer.cpp

@@ -45,7 +45,7 @@ namespace PolyVox
 		LARGE_INTEGER li;
 		if(!QueryPerformanceFrequency(&li))
 		{
-			logWarning() << "QueryPerformanceFrequency failed!";
+			POLYVOX_LOG_WARNING("QueryPerformanceFrequency failed!");
 			m_fPCFreq = 1.0f;
 		}