Some changes.
Merge branch 'master' of github.com:dyli2000/CSharpWorkplace

Conflicts:
	ServiceCall/MainTool/MainTool.suo
	Tool/Tool.suo