Merge branch 'master' of gitlab.fi.muni.cz:grp-fidentis/analyst2 into 36-implement-the-icp-algorithm2