Merge branch 'master' into feature/jack

Conflicts:
	src/abstractclipitem.cpp
	src/abstractclipitem.h
	src/abstractgroupitem.cpp
	src/abstractgroupitem.h
	src/abstractmonitor.h
	src/archivewidget.cpp
	src/clipitem.cpp
	src/clipmanager.cpp
	src/clipproperties.cpp
	src/clipproperties.h
	src/clipstabilize.cpp
	src/clipstabilize.h
	src/commands/razorclipcommand.cpp
	src/commands/razorclipcommand.h
	src/customruler.cpp
	src/customtrackview.cpp
	src/customtrackview.h
	src/docclipbase.cpp
	src/docclipbase.h
	src/doubleparameterwidget.cpp
	src/dvdwizard.cpp
	src/dvdwizard.h
	src/dvdwizardchapters.cpp
	src/dvdwizardmenu.cpp
	src/dvdwizardmenu.h
	src/dvdwizardvob.cpp
	src/effectstack/collapsibleeffect.cpp
	src/graphicsscenerectmove.cpp
	src/jogshuttle.cpp
	src/kdenlive.desktop
	src/kdenlive.notifyrc
	src/kdenlivedoc.cpp
	src/kdenlivedoc.h
	src/keyframehelper.cpp
	src/mainwindow.cpp
	src/mainwindow.h
	src/markerdialog.cpp
	src/monitor.cpp
	src/monitor.h
	src/monitormanager.cpp
	src/monitormanager.h
	src/onmonitoritems/onmonitorcornersitem.cpp
	src/onmonitoritems/onmonitorrectitem.cpp
	src/projectlist.cpp
	src/projecttree/meltjob.h
	src/projecttree/proxyclipjob.cpp
	src/renderer.cpp
	src/renderer.h
	src/renderwidget.cpp
	src/renderwidget.h
	src/scopes/audioscopes/audiospectrum.cpp
	src/scopes/audioscopes/spectrogram.cpp
	src/titlewidget.cpp
	src/transition.cpp
	src/transitionsettings.cpp
	src/videoglwidget.cpp
	src/videoglwidget.h
	thumbnailer/westleypreview.desktop