minh
Merge branch 'master' of https://github.com/strawberryjam/SaleManagement

Conflicts:
	SaleManagement/DataFolder/data.WakTDef
	SaleManagement/Model.waModel