Merge branch 'master' of git@github.com:XMTHOK/HNXC_WCS.git

Conflicts:
	THOK.XC.Dispatching/View/Control/ButtonArea.resx
Merge branch 'master' of git@github.com:shjstudy/HNXC_WCS.git

Conflicts:
	THOK.XC.Dispatching/View/Control/ButtonArea.resx