Dev: project finished: merge into main branch

[Kallepan]

Project finished -> thesis submitted. Therefore a merge into the main branch with the latest changes is done.