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/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__