Merge branch 'bob-oct15'

@@ -19,7 +19,7 @@
 
 
 <http://www.reportinghub.no/ep/spin/dpr-tables>
 <http://www.reportinghub.no/ep/spin/dpr-tables>
       rdf:type owl:Ontology ;
       rdf:type owl:Ontology ;
-      owl:imports <http://spinrdf.org/spin> , <http://www.reportinghub.no/ep/mpr/spin/1.1/lib> , <http://www.reportinghub.no/ep/schema/1.0/production> , <http://www.reportinghub.no/ep/spin/1.1/lib> , <http://www.reportinghub.no/spin/rh> ;
+      owl:imports <http://www.reportinghub.no/spin/rh> , <http://www.reportinghub.no/ep/spin/1.1/lib> , <http://www.reportinghub.no/ep/schema/1.0/production> , <http://www.reportinghub.no/ep/mpr/spin/1.1/lib> , <http://spinrdf.org/spin> ;
       owl:versionInfo "Created with TopBraid Composer"^^xsd:string .
       owl:versionInfo "Created with TopBraid Composer"^^xsd:string .
 
 
 dpr-tables:ExportVolumes
 dpr-tables:ExportVolumes
@@ -3146,7 +3146,7 @@ dpr-tables:ProductionOperationActivity
                                       ])
                                       ])
                           ])
                           ])
               ] ;
               ] ;
-      rhspin:tableHeaders ("Facility"^^xsd:string "Activity Type"^^xsd:string "Started or Nominally At"^^xsd:string "Finished At"^^xsd:string "Desciption"^^xsd:string) .
+      rhspin:tableHeaders ("Facility"^^xsd:string "Activity Type"^^xsd:string "Started or Nominally At"^^xsd:string "Finished At"^^xsd:string "Description"^^xsd:string) .
 
 
 dpr-tables:ProductionOperationCargoShip
 dpr-tables:ProductionOperationCargoShip
       rdf:type rhspin:TableTemplate ;
       rdf:type rhspin:TableTemplate ;
@@ -3299,10 +3299,10 @@ dpr-tables:ProductionOperationCargoShip
                             sp:elements ([ sp:object <http://www.reportinghub.no/ep/schema/production-activity#ProductionOperation> ;
                             sp:elements ([ sp:object <http://www.reportinghub.no/ep/schema/production-activity#ProductionOperation> ;
                                         sp:predicate rdf:type ;
                                         sp:predicate rdf:type ;
                                         sp:subject
                                         sp:subject
-                                                [ sp:varName "productionoperation"^^xsd:string
+                                                [ sp:varName "productionOperation"^^xsd:string
                                                 ]
                                                 ]
                                       ] [ sp:object
                                       ] [ sp:object
-                                                [ sp:varName "productionoperation"^^xsd:string
+                                                [ sp:varName "productionOperation"^^xsd:string
                                                 ] ;
                                                 ] ;
                                         sp:predicate <http://www.reportinghub.no/ep/schema/core#partOf> ;
                                         sp:predicate <http://www.reportinghub.no/ep/schema/core#partOf> ;
                                         sp:subject
                                         sp:subject
@@ -3375,7 +3375,8 @@ dpr-tables:ProductionOperationCargoShip
                                         sp:subject
                                         sp:subject
                                                 [ sp:varName "wholelifeperson"^^xsd:string
                                                 [ sp:varName "wholelifeperson"^^xsd:string
                                                 ]
                                                 ]
-                                      ] [ sp:object
+                                      ] [ rdf:type sp:Optional ;
+                                        sp:elements ([ sp:object
                                                             [ sp:varName "quantityofmaterial"^^xsd:string
                                                             [ sp:varName "quantityofmaterial"^^xsd:string
                                                             ] ;
                                                             ] ;
                                                     sp:predicate <http://www.reportinghub.no/ep/schema/production-activity#cargoLoaded> ;
                                                     sp:predicate <http://www.reportinghub.no/ep/schema/production-activity#cargoLoaded> ;
@@ -3396,8 +3397,9 @@ dpr-tables:ProductionOperationCargoShip
                                                             ]
                                                             ]
                                                   ])
                                                   ])
                                       ])
                                       ])
+                          ])
               ] ;
               ] ;
-      rhspin:tableHeaders ("Facility"^^xsd:string "Activity Type"^^xsd:string "Started or Nominally At"^^xsd:string "Finished At"^^xsd:string "Desciption"^^xsd:string "Ship"^^xsd:string "Captain"^^xsd:string "Cargo Description"^^xsd:string) .
+      rhspin:tableHeaders ("Facility"^^xsd:string "Activity Type"^^xsd:string "Started or Nominally At"^^xsd:string "Finished At"^^xsd:string "Description"^^xsd:string "Ship"^^xsd:string "Captain"^^xsd:string "Cargo Description"^^xsd:string) .
 
 
 dpr-tables:ProductionOperationMarine
 dpr-tables:ProductionOperationMarine
       rdf:type rhspin:TableTemplate ;
       rdf:type rhspin:TableTemplate ;