~~
Merge branch 'master' of github.com:niwho/ArcGISFundation

Conflicts:
	MainForm.cs
~~
wt
Merge branch 'master' of github.com:niwho/ArcGISFundation

Conflicts:
	MainForm.Designer.cs
	MainForm.cs
wt1
wt2