Merge branch 'master' into feature/websocketnavigation

This merge changes the default websocket port from 8001 to 4862.

modules/server/include/topics/authorizationtopic.h

@@ -31,7 +31,7 @@ namespace openspace {
 
 class AuthorizationTopic : public Topic {
 public:
-    AuthorizationTopic() = default;
+    AuthorizationTopic(std::string password);
 
     void handleJson(const nlohmann::json& json) override;
     bool isDone() const override;
@@ -39,6 +39,7 @@ public:
 private:
     bool authorize(const std::string& key);
 
+    std::string _password;
     bool _isAuthenticated = false;
 };