Changes

To Be Continue.
Merge remote-tracking branch 'origin/master'

Conflicts:
	nPOSProj/mdiOrdering.Designer.cs