Merge remote-tracking branch 'origin/master'

Conflicts:
	App1/App1/App1.Windows/obj/Debug/App.g.cs
	App1/App1/App1.Windows/obj/Debug/MainPage.g.cs
	App1/App1/App1.Windows/obj/Debug/MainPage.g.i.cs
	App1/App1/App1.Windows/obj/Debug/XamlSaveStateFile.xml