Changes

Changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	nPOSProj/frmLogin.resx