something
Merge branch 'master' of https://github.com/philt5252/GoldenHorse

Conflicts:
	Olf.GoldenHorse/Olf.GoldenHorse.Core.Views/TestScreenshotsView.xaml
screenshots and shellview
Merge branch 'master' of https://github.com/philt5252/GoldenHorse