zp 测试csproj
Merge branch 'master' of https://github.com/njunet/Water2014

Conflicts:
	water125/Water125/Water125.csproj
张鹏 添加监测站地理信息