Merge branch 'develop' of github.com:urska19/LVR-sat into develop
Merge branch 'mthreading' of github.com:urska19/LVR-sat into mthreading