Merge branch 'master' into feature/pkey

Conflicts:
	src/mainwindow.h

diff --cc src/customtrackview.cpp
Simple merge

diff --cc src/customtrackview.h
Simple merge

diff --cc src/mainwindow.cpp
Simple merge

diff --cc src/mainwindow.h
index 67f31ea10b723663a630c9371cdcbfcd84d39e61,9efa6e4c741c8d1c26164ce2295559cec8ac8722..db1cbc2252d415b8877429a991d45720d1c7ebfc
--- 1/src/mainwindow.h
--- 2/src/mainwindow.h
+++ b/src/mainwindow.h
@@@ -567,9 -567,7 +567,9 @@@ private slots
      /** @brief Save current timeline clip as mlt playlist. */
      void slotSaveTimelineClip();
      /** @brief Process keyframe data sent from a clip to effect / transition stack. */
-     void slotProcessImportKeyframes(GRAPHICSRECTITEM type, const QString& data);
+     void slotProcessImportKeyframes(GRAPHICSRECTITEM type, const QString& data, int maximum);
 +    /** @brief Move playhead to mouse curser position if defined key is pressed */
 +    void slotAlignPlayheadToMousePos();
  
  signals:
      Q_SCRIPTABLE void abortRenderJob(const QString &url);