Merge branch 'master' into buildsystem

Conflicts:
	CMakeLists.txt
	po/CMakeLists.txt

diff --cc src/kdenlivesettingsdialog.cpp
Simple merge

diff --cc src/mainwindow.cpp
Simple merge

diff --cc src/monitor.cpp
Simple merge

diff --cc src/projectlist.cpp
Simple merge

diff --cc src/projectsettings.cpp
Simple merge

diff --cc src/renderer.h
Simple merge

diff --cc src/wizard.cpp
Simple merge