Merge branch 'master'
Save settings of an action
temp commit
Merge branch 'master'
Finish the dialog to input custom path
Merge branch 'master'

Conflicts:
	AsmQuickLauncher/AsmQuickLauncher/Recognize.asm
	AsmQuickLauncher/AsmQuickLauncher/settings.ini
temp commit
Merge branch 'master'

Conflicts:
	AsmQuickLauncher/AsmQuickLauncher/Recognize.asm
	AsmQuickLauncher/AsmQuickLauncher/settings.ini
Finish the char encoding problem
Merge branch 'syb'