Merge remote-tracking branch 'upstream/master' into cdj

Conflicts:
	src/controlobjectthreadwidget.cpp
	src/controlobjectthreadwidget.h
	src/engine/cuecontrol.cpp
	src/engine/enginebuffer.cpp
	src/engine/enginebuffer.h
	src/engine/enginemaster.h
	src/skin/legacyskinparser.cpp
	src/sounddeviceportaudio.cpp
	src/widget/wpushbutton.cpp
	src/widget/wpushbutton.h
	src/widget/wwidget.cpp
	src/widget/wwidget.h