doxygen
Merge branch 'master' into mdMultisync

Conflicts:
	app/SonyTool/SonyToolWindow.cpp
	app/SonyTool/SonyToolWindow.h