temp
Merge branch 'master' of https://github.com/onesliu/NoMark

Conflicts:
	OrderUnit.cpp
	StorageUnit.dfm
	debug/UpdatePrice.txt
Merge branch 'master' of https://github.com/onesliu/NoMark
fix datatype.