settings
Merge branch 'master' of https://github.com/jonongjs/auv-vision-system

Conflicts:
	src/FilterSettingWidget.cpp
settings