Merge branch 'master' into v0.6.0

# Conflicts:
#	src/ifcconvert/IfcConvert.cpp
#	src/ifcgeom/IfcGeomRenderStyles.cpp
#	src/ifcgeom/IfcGeomWires.cpp
#	src/ifcparse/IfcLogger.cpp
#	src/ifcparse/IfcLogger.h
#	src/ifcparse/IfcParse.cpp
#	src/ifcparse/IfcUtil.cpp
#	src/serializers/ColladaSerializer.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);