Conflicts:
	src/kthumb.cpp
	src/lib/audio/fftTools.cpp
	src/onmonitoritems/rotoscoping/nearestpoint.cpp
	src/widgets/choosecolorwidget.cpp
	src/widgets/colorwheel.cpp
	src/widgets/videoglwidget.cpp