update
Merge branch 'master' of github.com:linkFly6/Said

Conflicts:
	Said.Core/Said.Common/Said.File/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	Said.v11.suo
	Said/Said.csproj
	Said/bin/Said.dll
	Said/bin/Said.pdb
	Said/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	Said/obj/Debug/Said.dll
	Said/obj/Debug/Said.pdb