merge
Merge branch 'master' of github.com:248668342/ScannerSetting

Conflicts:
	ScannerSetting.suo
	bin/ScannerSetting.exe