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