w
Merge remote-tracking branch 'origin/master'

Conflicts:
	Video Effect Test App/MainPage.xaml.cs