Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management

Conflicts:
	data/scene/default.scene
	modules/sync/syncmodule.h
	openspace.cfg
	src/engine/openspaceengine.cpp
	src/scene/scene.cpp
	src/scene/scene_doc.inl
	src/scene/scenegraphnode.cpp
	src/scene/scenegraphnode_doc.inl
	src/scene/sceneloader.cpp
	src/scripting/scriptengine.cpp

include/openspace/scripting/lualibrary.h

@@ -30,8 +30,7 @@
 #include <string>
 #include <vector>
 
-namespace openspace {
-namespace scripting {
+namespace openspace::scripting {
 
 /**
 * This structure represents a Lua library, itself consisting of a unique #name and
@@ -80,7 +79,6 @@ struct LuaLibrary {
     bool operator<(const LuaLibrary& rhs) const;
 };
 
-} // namespace scripting
-} // namespace openspace
+} // namespace openspace::scripting
 
 #endif // __OPENSPACE_CORE___LUALIBRARY___H__

include/openspace/scripting/scriptengine.h

@@ -38,11 +38,9 @@
 #include <memory>
 #include <set>
 
-namespace openspace {
+namespace openspace { class SyncBuffer; }
 
-class SyncBuffer;
-
-namespace scripting {
+namespace openspace::scripting {
 
 /**
  * The ScriptEngine is responsible for handling the execution of custom Lua functions and
@@ -133,7 +131,6 @@ private:
     std::string _logFilename;
 };
 
-} // namespace scripting
-} // namespace openspace
+} // namespace openspace::scripting
 
 #endif // __OPENSPACE_CORE___SCRIPTENGINE___H__

include/openspace/scripting/scriptscheduler.h

@@ -30,13 +30,11 @@
 #include <queue>
 #include <vector>
 
-namespace ghoul {
-class Dictionary;
-} // namespace ghoul
+namespace ghoul { class Dictionary; }
 
-namespace openspace {
-namespace documentation { struct Documentation; }
-namespace scripting {
+namespace openspace::documentation { struct Documentation; }
+
+namespace openspace::scripting {
 
 /**
  * Maintains an ordered list of <code>ScheduledScript</code>s and provides a simple 
@@ -123,7 +121,6 @@ private:
 
 };
 
-} // namespace scripting
-} // namespace openspace
+} // namespace openspace::scripting
 
 #endif // __OPENSPACE_CORE___SCRIPTSCHEDULER___H__

include/openspace/scripting/systemcapabilitiesbinding.h

@@ -27,13 +27,11 @@
 
 #include <openspace/scripting/lualibrary.h>
 
-namespace openspace {
-namespace scripting {
+namespace openspace::scripting {
 
 LuaLibrary generalSystemCapabilities();
 LuaLibrary openglSystemCapabilities();
 
-} // namespace scripting
-} // namespace openspace
+} // namespace openspace::scripting
 
 #endif // __OPENSPACE_CORE___SYSTEMCAPABILITIESBINDING___H__