Conflicts:
	.gitmodules
	applications/tango
	common/src/ConfigUtils.cpp
	config.inc_default
	control/src/CtVideo.cpp
	sip/configure.py