GitLab

Fix merge errors and conflicts 

Fix obvious merge errors 

Fix: Abs command defaults to abs(float arg) on Windows, abs(int arg) on Linux -> use std::abs(float arg)

Fix linux build: Added OSHelper::getDirPrefix, since linux does not support drive letter substitution.