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

modules/sync/syncmodule.h

@@ -41,6 +41,4 @@ protected:
     void internalInitialize() override;
 };
 
-} // namespace openspace
-
-#endif // __OPENSPACE_MODULE_SPACE___SYNCMODULE___H__
+} // namespace openspace