Conflicts: ges/ges-pitivi-formatter.c ges/ges-uri-clip.c tests/check/ges/project.c tests/check/ges/uriclip.c