sdf
Merge branch 'master' of github.com:spawluk/24h-app

Conflicts:
	src/Tron/Tron.Shared/App.xaml
	src/Tron/Tron.Shared/MainPage.xaml.cs
	src/Tron/Tron.Windows/MainPage.xaml