fix bug
Merge remote-tracking branch 'origin/MoreIM' into milk

Conflicts:
	Business/ClientInfoModel.cs
adds