Merge branch 'v0.6.0' into v0.7.0

# Conflicts:
#	cmake/CMakeLists.txt
#	src/ifcconvert/IfcConvert.cpp
#	src/ifcgeom/IfcGeomRepresentation.h
#	src/ifcgeom/IfcRepresentationShapeItem.h
#	src/ifcgeom/kernels/opencascade/IfcGeomFunctions.cpp
#	src/ifcgeom/schema_agnostic/IfcGeomRepresentation.cpp
#	src/ifcgeom/schema_agnostic/Kernel.cpp
#	src/ifcgeom/schema_agnostic/Kernel.h
#	src/ifcgeomserver/IfcGeomServer.cpp
#	src/serializers/schema_dependent/XmlSerializer.cpp

src/ifcgeom/schema_agnostic/SurfaceStyle.cpp

@@ -72,6 +72,7 @@ void IfcGeom::set_default_style_file(const std::string& json_file) {
 	if (!default_materials_initialized) InitDefaultMaterials();
 	default_materials.clear();
 
+	// @todo this will probably need to be updated for UTF-8 paths on Windows
 	pt::ptree root;
 	pt::read_json(json_file, root);