Solve merge conflicts: develop --> globebrowsing

include/openspace/util/openspacemodule.h

@@ -25,7 +25,10 @@
 #ifndef __OPENSPACEMODULE_H__
 #define __OPENSPACEMODULE_H__
 
+#include <openspace/properties/propertyowner.h>
+
 #include <string>
+#include <vector>
 
 namespace openspace {
 
@@ -34,7 +37,7 @@ namespace openspace {
  * into a useful granularity to be mostly used self-sufficiently. Each OpenSpaceModule
  * needs a unique, nonempty <code>name</code>.
  */
-class OpenSpaceModule {
+class OpenSpaceModule : public properties::PropertyOwner {
 public:
     /**
      * Constructs the OpenSpaceModule with a specific \p name. The uniqueness of the 
@@ -61,12 +64,6 @@ public:
      */
     void deinitialize();
 
-    /**
-     * Returns the name for this OpenSpaceModule.
-     * \return THe name for this OpenSpaceModule
-     */
-    std::string name() const;
-
 protected:
     /**
      * Customization point for each derived class. The internalInitialize method is called
@@ -85,9 +82,6 @@ protected:
      * path tokens.
      */
     std::string modulePath() const;
-
-    /// The name of this OpenSpaceModule
-    const std::string _name;
 };
 
 } // namespace openspace

include/openspace/util/spicemanager.h

@@ -682,7 +682,7 @@ public:
      * \param destinationFrame The name of the destination reference frame
      * \param ephemerisTimeFrom The time for the source reference frame
      * \param ephemerisTimeTo The time for the destination reference frame
-     * \return Thetransformation matrix that maps between the \p sourceFrame at time
+     * \return The transformation matrix that maps between the \p sourceFrame at time
      * \p ephemerisTimeFrom to the \p destinationFrame at the time \p ephemerisTimeTo.
      * \throws SpiceException If there is no coverage available for the specified
      * \p sourceFrame and \p destinationFrame