Merge branch 'master' of https://github.com/opentrack/opentrack into tidy/ewma2
Merge branch 'tidy/ewma2' into dev/ewma2