Conflict Test
Merge branch 'master' of https://github.com/opencvUniversityProject/opencv