Conflicts:
	src/Media/Media.cpp
	src/Media/Media.h
	src/Renderer/ClipRenderer.cpp
	src/Workflow/ClipWorkflow.cpp
	src/Workflow/ClipWorkflow.h
	src/Workflow/MainWorkflow.cpp
	src/Workflow/MainWorkflow.h
	src/Workflow/TrackWorkflow.cpp
	vlmc.pro