Signed-off-by: yandizheng <yandi.zheng@gmail.com>
Merge branch 'master' of https://github.com/yandizheng/QuaintHouse.git

Conflicts:
	EFPrototype/EFPrototype/Business/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	EFPrototype/EFPrototype/DataAccess/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	EFPrototype/EFPrototype/EFInfrustructure/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	EFPrototype/EFPrototype/EFPrototype.v11.suo
	EFPrototype/EFPrototype/Prototype.Mvc4.Tests/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	EFPrototype/EFPrototype/Prototype.Mvc4/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	EFPrototype/EFPrototype/PrototypeSite.Tests/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	EFPrototype/EFPrototype/PrototypeSite/bin/Microsoft.Practices.Unity.Configuration.dll
	EFPrototype/EFPrototype/PrototypeSite/bin/Microsoft.Practices.Unity.dll
	EFPrototype/EFPrototype/PrototypeSite/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	EFPrototype/EFPrototype/QuaintHouse.Route/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	QHLibrary/QuaintHouse.Core/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	QHLibrary/QuaintHouse.MvcBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	QHLibrary/QuaintHouse.Scheduler/bin/Debug/QuaintHouse.Scheduler.dll
	QHLibrary/QuaintHouse.Scheduler/bin/Debug/QuaintHouse.Scheduler.pdb
	QHLibrary/QuaintHouse.Scheduler/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	QHLibrary/QuaintHouse.Scheduler/obj/Debug/QuaintHouse.Scheduler.csproj.FileListAbsolute.txt
	QHLibrary/QuaintHouse.Scheduler/obj/Debug/QuaintHouse.Scheduler.dll
	QHLibrary/QuaintHouse.Scheduler/obj/Debug/QuaintHouse.Scheduler.pdb
	QHLibrary/QuaintHouse.Scheduler/obj/Debug/ResolveAssemblyReference.cache
	QHLibrary/QuaintHouse.Util/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	QHLibrary/QuaintHouse.Web/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache