not much
some minor changes
Merge remote-tracking branch 'github/master'

Conflicts:
	Tourist App Version 1.0.v12.suo
	Tourist App Version 1.0/bin/Debug/Tourist App Version 1.0.exe
	Tourist App Version 1.0/bin/Debug/Tourist App Version 1.0.pdb
	Tourist App Version 1.0/obj/Debug/Tourist App Version 1.0.exe
	Tourist App Version 1.0/obj/Debug/Tourist App Version 1.0.pdb
	Tourist App Version 1.0/obj/Debug/XamlTypeInfo.g.cs
	Tourist App Version 1.0/obj/Debug/intermediatexaml/Tourist App Version 1.0.exe
	Tourist App Version 1.0/obj/Debug/intermediatexaml/Tourist App Version 1.0.pdb