cancel button, localization
Merge branch 'overlay_selector'

Conflicts:
	FlagMaker/Localization/strings.resx