mxd路径改变
deleted:    bin/.gitignore(old) ,add Eclipse java commit
meger master
meger master 2
add .gitignore
del bin
Merge branch 'master' into vonpower

Conflicts:
	TDsystem2/bin/icon/KyInspectResult.html
	TDsystem2/src/net/ckpark/tdsys/ui/main/MainUI.java
add html
make diff
Merge branch 'master' into vonpower

Conflicts:
	TDsystem2/src/net/ckpark/tdsys/ui/dialog/CreateWizardStep1.java
add field repaired
del bin\gitignore
Merge remote-tracking branch 'remotes/origin/vonpower' into ZHQ
更新导入底图（导入成功，但还存在空指针异常）和数据校验，添加缺失字段
更新数据导入