new file:   test.txt
yuhui
	modified:   Pigeon/obj/Debug/App.g.i.cs
	modified:   Pigeon/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	modified:   Pigeon/obj/Debug/Login.g.i.cs
	modified:   Pigeon/obj/Debug/MainPage.g.i.cs
	new file:   Pigeon.v11.suo
Merge branch 'developer' into yuhui
modify
	new file:   Pigeon/Pigeon.csproj.user.orig
	deleted:    obj/Debug/App.g.cs
	deleted:    obj/Debug/App.g.i.cs
	deleted:    obj/Debug/App.g.i.cs.orig
	deleted:    obj/Debug/App.g.i.cs.orig.orig
	deleted:    obj/Debug/DesignTimeResolveAssemblyReferences.cache
	deleted:    obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	deleted:    obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache.orig
	deleted:    obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache.orig.orig
	deleted:    obj/Debug/Login.g.i.cs
	deleted:    obj/Debug/MDIL/MDILFileList.xml
	deleted:    obj/Debug/MDIL/MDILXapCompileLog.txt
	deleted:    obj/Debug/MDIL/MatriX.dll
	deleted:    obj/Debug/MDIL/Pigeon.dll
	deleted:    obj/Debug/MDILCacheFile.xml
	deleted:    obj/Debug/Main.g.i.cs
	deleted:    obj/Debug/MainPage.g.cs
	deleted:    obj/Debug/MainPage.g.i.cs#
	deleted:    obj/Debug/MainPage.g.i.cs.orig
	deleted:    obj/Debug/MainPage.g.i.cs.orig.orig
	deleted:    obj/Debug/Navigation.g.i.cs
	deleted:    obj/Debug/Pigeon.Resources.AppResources.resources
	deleted:    obj/Debug/Pigeon.csproj.FileListAbsolute.txt
	deleted:    obj/Debug/Pigeon.csproj.GenerateResource.Cache
	deleted:    obj/Debug/Pigeon.csprojResolveAssemblyReference.cache
	deleted:    obj/Debug/Pigeon.dll
	deleted:    obj/Debug/Pigeon.g.resources
	deleted:    obj/Debug/Pigeon.pdb
	deleted:    obj/Debug/TemporaryGeneratedFile_036C0B5B-1481-4323-8D20-8F5ADCB23D92.cs
	deleted:    obj/Debug/TemporaryGeneratedFile_5937a670-0e60-4077-877b-f7221da3dda1.cs
	deleted:    obj/Debug/TemporaryGeneratedFile_E7A71F73-0F8D-4B9B-B56E-8E70B10BC5D3.cs
	deleted:    obj/Debug/XapCacheFile.xml
	modified:   obj/Debug/Main.g.i.cs
	modified:   obj/Debug/Navigation.g.i.cs
	deleted:    obj/Debug/App.g.cs#
	deleted:    obj/Debug/App.g.i.cs
	deleted:    Pigeon.csproj.user
dfjofdj
dfjodf
remove obj
modify
	modified:   Bin/Debug/MDIL/Pigeon.dll
	modified:   Bin/Debug/Pigeon.dll
	modified:   Bin/Debug/Pigeon.pdb
	modified:   Bin/Debug/Pigeon_Debug_AnyCPU.xap
	modified:   Login.xaml
	modified:   Login.xaml.cs
	modified:   MainPage.xaml.cs
Merge branch 'developer' into liuxiaohao
modify
	deleted:    test.txt
Merge branch 'developer' of https://github.com/liuxiaohao/Pigeon into developer

Conflicts:
	Pigeon/obj/Debug/App.g.i.cs
	Pigeon/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	Pigeon/obj/Debug/Login.g.i.cs
	Pigeon/obj/Debug/Main.g.i.cs
	Pigeon/obj/Debug/MainPage.g.i.cs
	Pigeon/obj/Debug/Navigation.g.i.cs