Merge pull request #1 from SheanWang/master

merge
update category.xaml

update category.xaml
Merge pull request #2 from tmac4096/master

update category.xaml
t
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
Revert "Merge remote-tracking branch 'origin/master'"

This reverts commit 6b38c646af302bb543a923015f59f4fd9f5aa0ed.
Revert "t"

This reverts commit 73ee46aae0b5844f5483deb53970c03cb4d2dffe.
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
aa
aa
Merge remote-tracking branch 'origin/master'

Conflicts:
	Location.v11.suo
	Location/Bin/Debug/Location.dll
	Location/Bin/Debug/Location.pdb
	Location/Bin/Debug/Location_Debug_AnyCPU.xap
	Location/Bin/Debug/Properties/WMAppManifest.xml
	Location/Category.xaml
	Location/LandingPage.xaml
	Location/Location.csproj.user
	Location/obj/Debug/Ads.g.i.cs
	Location/obj/Debug/App.g.i.cs
	Location/obj/Debug/Category.g.i.cs
	Location/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	Location/obj/Debug/LandingPage.g.i.cs
bb
cc
dd
ee
Merge pull request #2 from SheanWang/master

123