.
Merge remote-tracking branch 'origin/master'

Conflicts:
	POS408.Team.UserManagement/frmUserManagement.vb