Для мержа
Merge branch 'master' of https://github.com/DrNorton/LittlePlace.WPClient.UI

Conflicts:
	LittlePlace.WPClient.UI.v11.suo
	LittlePlace.WPClient.UI/Bin/Debug/LittlePlace.WPClient.UI.dll
	LittlePlace.WPClient.UI/Bin/Debug/LittlePlace.WPClient.UI.pdb
	LittlePlace.WPClient.UI/Bin/Debug/LittlePlace.WPClient.UI.xap
	LittlePlace.WPClient.UI/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	LittlePlace.WPClient.UI/obj/Debug/LittlePlace.WPClient.UI.csprojResolveAssemblyReference.cache
	LittlePlace.WPClient.UI/obj/Debug/LittlePlace.WPClient.UI.dll
	LittlePlace.WPClient.UI/obj/Debug/LittlePlace.WPClient.UI.pdb
	LittlePlace.WPClient.UI/obj/Debug/Views/FriendContactDetailView.g.cs
	LittlePlace.WPClient.UI/obj/Debug/Views/FriendContactDetailView.g.i.cs
	LittlePlace.WPClient.UI/obj/Debug/Views/MapView.g.cs
	LittlePlace.WPClient.UI/obj/Debug/Views/MapView.g.i.cs
	LittlePlace.WPClient.UI/obj/Debug/XapCacheFile.xml
Merge
Merge
Merge branch 'master' of https://github.com/DrNorton/LittlePlace.WPClient.UI

Conflicts:
	LittlePlace.Api/bin/Debug/LittlePlace.Api.dll
	LittlePlace.Api/bin/Debug/LittlePlace.Api.pdb
	LittlePlace.Api/obj/Debug/LittlePlace.Api.csproj.FileListAbsolute.txt
	LittlePlace.Api/obj/Debug/LittlePlace.Api.csprojResolveAssemblyReference.cache
	LittlePlace.Api/obj/Debug/LittlePlace.Api.dll
	LittlePlace.Api/obj/Debug/LittlePlace.Api.pdb
	LittlePlace.WPClient.UI.v11.suo
	LittlePlace.WPClient.UI/Bin/Debug/LittlePlace.Api.dll
	LittlePlace.WPClient.UI/Bin/Debug/LittlePlace.Api.pdb
	LittlePlace.WPClient.UI/Bin/Debug/LittlePlace.WPClient.UI.dll
	LittlePlace.WPClient.UI/Bin/Debug/LittlePlace.WPClient.UI.pdb
	LittlePlace.WPClient.UI/Bin/Debug/LittlePlace.WPClient.UI.xap
	LittlePlace.WPClient.UI/obj/Debug/LittlePlace.WPClient.UI.csprojResolveAssemblyReference.cache
	LittlePlace.WPClient.UI/obj/Debug/LittlePlace.WPClient.UI.dll
	LittlePlace.WPClient.UI/obj/Debug/LittlePlace.WPClient.UI.pdb
	LittlePlace.WPClient.UI/obj/Debug/Views/MapView.g.cs
	LittlePlace.WPClient.UI/obj/Debug/Views/MapView.g.i.cs
	LittlePlace.WPClient.UI/obj/Debug/XapCacheFile.xml