Merge remote-tracking branch 'origin/master'

Conflicts:
	Location/Bin/Debug/Location.dll
	Location/Bin/Debug/Location.pdb
	Location/Bin/Debug/Location_Debug_AnyCPU.xap
	Location/obj/Debug/Ads.g.cs
	Location/obj/Debug/Ads.g.i.cs
	Location/obj/Debug/App.g.cs
	Location/obj/Debug/App.g.i.cs
	Location/obj/Debug/Category.g.cs
	Location/obj/Debug/Category.g.i.cs
	Location/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	Location/obj/Debug/LandingPage.g.cs
	Location/obj/Debug/LandingPage.g.i.cs
	Location/obj/Debug/Location.csproj.FileListAbsolute.txt
	Location/obj/Debug/Location.csproj.GenerateResource.Cache
	Location/obj/Debug/Location.dll
	Location/obj/Debug/Location.g.resources
	Location/obj/Debug/Location.pdb
	Location/obj/Debug/XapCacheFile.xml