changes

changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	nPOSProj/mdiItemKits.Designer.cs