Merge branch 'master' into v0.6.0

# Conflicts:
#	src/ifcconvert/IfcConvert.cpp
#	src/ifcgeom/IfcGeomShapes.cpp
#	src/serializers/ColladaSerializer.cpp
#	src/serializers/schema_dependent/XmlSerializer.cpp

src/ifcparse/IfcParse.cpp

@@ -1810,7 +1810,7 @@ void IfcFile::removeEntity(IfcUtil::IfcBaseClass* entity) {
 			entities_by_ref_t::iterator byref_it = byref.find(name);
 			if (byref_it != byref.end()) {
 				std::vector<unsigned>& ids = byref_it->second;
-				std::remove(ids.begin(), ids.end(), name);
+				ids.erase(std::remove(ids.begin(), ids.end(), id), ids.end());
 			}
 		}
 	}