Merge branch 'master' of /home/sylvain/IdeaProjects/Persons_Comparator with conflicts.