头像
Merge branch 'master' of https://github.com/xici/microassistant

Conflicts:
	MicroAssistant/MicroAssistantMvc.Tests/MicroAssistantMvc.Tests.csproj
	MicroAssistant/MicroAssistantMvc3/Areas/ContractManagement/Controllers/ContractInfoController.cs
	MicroAssistant/MicroAssistantMvc3/MicroAssistantMvc3.csproj
	MicroAssistant/MicroAssistantMvc3/MicroAssistantMvc3.csproj.user
	MicroAssistant/MicroAssistantMvc3/bin/MicroAssistant.Cache.dll
	MicroAssistant/MicroAssistantMvc3/bin/MicroAssistant.Cache.pdb
	MicroAssistant/MicroAssistantMvc3/bin/MicroAssistant.Common.dll
	MicroAssistant/MicroAssistantMvc3/bin/MicroAssistant.Common.pdb
	MicroAssistant/MicroAssistantMvc3/bin/MicroAssistant.DataAccess.dll
	MicroAssistant/MicroAssistantMvc3/bin/MicroAssistant.DataAccess.pdb
	MicroAssistant/MicroAssistantMvc3/bin/MicroAssistant.DataStructure.dll
	MicroAssistant/MicroAssistantMvc3/bin/MicroAssistant.DataStructure.pdb
	MicroAssistant/MicroAssistantMvc3/bin/MicroAssistant.Meta.dll
	MicroAssistant/MicroAssistantMvc3/bin/MicroAssistant.Meta.pdb
	MicroAssistant/MicroAssistantMvc3/bin/MicroAssistantMvc3.dll
	MicroAssistant/MicroAssistantMvc3/bin/MicroAssistantMvc3.pdb
	MicroAssistant/MicroAssistantMvc3/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	MicroAssistant/MicroAssistantMvc3/obj/Debug/MicroAssistantMvc3.csprojResolveAssemblyReference.cache
	MicroAssistant/MicroAssistantMvc3/obj/Debug/MicroAssistantMvc3.dll
	MicroAssistant/MicroAssistantMvc3/obj/Debug/MicroAssistantMvc3.pdb