Merge branch 'master' into CleanMar3

@@ -342,6 +342,12 @@ ep-flow:Inventory
       rdfs:label "inventory"^^xsd:string ;
       rdfs:subClassOf ep-core:PhysicalObject .
 
+ep-flow:InventoryInAStandardState
+      rdf:type owl:Class ;
+      rdfs:comment "inventory that is in a standard state"^^xsd:string ;
+      rdfs:label "inventory in a standard state"^^xsd:string ;
+      rdfs:subClassOf ep-flow:Inventory .
+
 ep-flow:MassAdjustedFlow
       rdf:type owl:Class , ep-flow:ProductionFlowDefinitionType ;
       rdfs:comment "flow that <not documented in XSD>"^^xsd:string ;
@@ -745,13 +751,6 @@ ep-flow:flowMeasuredBy
       rdfs:label "flow measured by"^^xsd:string ;
       rdfs:range <http://www.reportinghub.no/ep/schema/facility#Facility> .
 
-ep-flow:flowMeasuredOrCalculatedAt
-      rdf:type owl:ObjectProperty ;
-      rdfs:comment "facility at which a flow is measured or calculated"^^xsd:string ;
-      rdfs:domain ep-flow:Flow ;
-      rdfs:label "flow measured or calculated at"^^xsd:string ;
-      rdfs:range <http://www.reportinghub.no/ep/schema/facility#Facility> .
-
 ep-flow:flowOutOf
       rdf:type owl:ObjectProperty ;
       rdfs:comment "physical thing that a flow is out of"^^xsd:string ;
@@ -825,6 +824,13 @@ ep-flow:materialThatFlows
       rdfs:label "material that flows"^^xsd:string ;
       rdfs:range ep-material:QuantityOfMaterial .
 
+ep-flow:measuredOrCalculatedAt
+      rdf:type owl:ObjectProperty ;
+      rdfs:comment "facility at which a flow or inventory is measured or calculated"^^xsd:string ;
+      rdfs:domain ep-core:PhysicalThing ;
+      rdfs:label "measured or calculated at"^^xsd:string ;
+      rdfs:range <http://www.reportinghub.no/ep/schema/facility#Facility> .
+
 ep-flow:reidVapourPressure
       rdf:type ep-core:Class_of_indirect_property , owl:ObjectProperty , owl:FunctionalProperty ;
       rdfs:comment "Reid vapor pressure of stabilized crude."^^xsd:string ;