query
Merge branch 'm2'

Conflicts:
	MainForm.Designer.cs
	MainForm.cs
	MainForm.resx
Merge branch 'master' of github.com:niwho/ArcGISFundation

Conflicts:
	MainForm.cs
	data/鐧戒笁鍙?鐧戒笁鍙?mxd
Merge branch 'master' of github.com:niwho/ArcGISFundation

Conflicts:
	MainForm.cs