brach1 changed
Merge branch 'branch1_test'

Conflicts:
	MainPage.xaml.cs