commit by fionawang
Merge branch 'master' of https://github.com/fionawang89/PMS

Conflicts:
	PMS/OffLineSale/OffLineSale/OffLineSale.BL/bin/x86/Debug/OffLineSale.BizProcess.dll
	PMS/OffLineSale/OffLineSale/OffLineSale.BL/bin/x86/Debug/OffLineSale.BizProcess.pdb
	PMS/OffLineSale/OffLineSale/OffLineSale.BL/obj/x86/Debug/OffLineSale.BizProcess.csproj.FileListAbsolute.txt
	PMS/OffLineSale/OffLineSale/OffLineSale.BL/obj/x86/Debug/OffLineSale.BizProcess.dll
	PMS/OffLineSale/OffLineSale/OffLineSale.BL/obj/x86/Debug/OffLineSale.BizProcess.pdb
	PMS/OffLineSale/OffLineSale/OffLineSale.UI/bin/OffLineSale.BizProcess.dll
	PMS/OffLineSale/OffLineSale/OffLineSale.UI/bin/OffLineSale.BizProcess.pdb