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
style refactoring
removing pointless, probably unused style
Merge branch 'random'

Conflicts:
	FlagMaker/Localization/strings.resx
clamp slider value when using keys
Merge branch 'random'
centering icon for ellipse
Merge branch 'random'
ring - drawing on canvas
ring svg export
adding netherlands to amsterdam preset
fix crashing when canceling image selection; keep slider settings for flags and images
fixing loading slider value issue

more presets
refactoring overlay factory to load overlays dynamically
rwanda
Merge branch 'ring'

Conflicts:
	FlagMaker/FlagMaker.csproj
	FlagMaker/Overlays/OverlayFactory.cs
fire / yang / mongolia
fixing ring overlay type not showing up
Merge branch 'master' into random