Update
Cleanup.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	BaseResources.xaml
	Styles/Seperator.xaml
	Styles/TabControl.xaml