Merge branch 'master'
Merge branch 'master'
Merge branch 'master'
Edit dialog control function
Merge branch 'syb'

Conflicts:
	AsmQuickLauncher/AsmQuickLauncher/AsmQuickLauncher.aps
	AsmQuickLauncher/AsmQuickLauncher/AsmQuickLauncher.rc
	AsmQuickLauncher/AsmQuickLauncher/resource.h