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;
 		}
 

library/PolyVoxCore/source/Region.cpp

@@ -23,6 +23,7 @@ freely, subject to the following restrictions:
 
 #include "PolyVoxCore/Region.h"
 
+#include <algorithm>
 #include <limits>
 
 namespace PolyVox