Merge branch 'audioAlign'

diff --cc src/CMakeLists.txt
Simple merge

diff --cc src/clipitem.h
Simple merge

diff --cc src/customtrackview.cpp
Simple merge

diff --cc src/customtrackview.h
Simple merge

diff --cc src/kdenlivesettings.kcfg
Simple merge

diff --cc src/mainwindow.cpp
Simple merge

diff --cc src/mainwindow.h
Simple merge

diff --cc src/renderer.cpp
Simple merge