Merge branch 'overlay_toggle'

Conflicts:
	FlagMaker/Overlays/OverlayControl.xaml
Merge branch 'master' of https://github.com/andrewsarnold/FlagMaker

Conflicts:
	FlagMaker/Localization/strings.resx
	FlagMaker/Overlays/OverlayControl.xaml