Beta-3 Release Candidate branch (#753)

* Merge experimental session recording branch
 * Merge new CEF-based webgui branch

modules/webgui/webguimodule.cpp

@@ -24,12 +24,11 @@
 
 #include <modules/webgui/webguimodule.h>
 
+#include <ghoul/fmt.h>
 #include <ghoul/filesystem/filesystem.h>
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/misc/dictionary.h>
 
-#include <fmt/format.h>
-
 namespace {
     constexpr const char* _loggerCat = "WebGuiModule";
 
@@ -114,6 +113,4 @@ void WebGuiModule::stopProcess() {
     _process = nullptr;
 }
 
-
 } // namespace openspace
-

modules/webgui/webguimodule.h

@@ -26,11 +26,10 @@
 #define __OPENSPACE_MODULE_WEBGUI___WEBGUIMODULE___H__
 
 #include <openspace/util/openspacemodule.h>
-#include <openspace/properties/scalar/boolproperty.h>
+
 #include <openspace/properties/stringproperty.h>
-
+#include <openspace/properties/scalar/boolproperty.h>
 #include <ghoul/misc/process.h>
-
 #include <memory>
 
 namespace openspace {
@@ -42,6 +41,7 @@ public:
 
 protected:
     void internalInitialize(const ghoul::Dictionary&) override;
+
 private:
     std::unique_ptr<ghoul::Process> _process;
     properties::BoolProperty _serverProcessEnabled;