test3
Merge remote-tracking branch 'origin/master'

Conflicts:

	UniversalMediaApp/UniversalMediaApp/UniversalMediaApp.Windows/HubPage.xaml.cs
Revert "test3"

This reverts commit 4348c6782c5f13fd34d8877cf085a9ebd5351681.