Conflicts:
	data/kdenlive.appdata.xml
	data/kdenlive.desktop
	data/kdenlive.notifyrc
	src/project/clipmanager.cpp
	src/project/projectlist.cpp
	src/renderer.cpp