addd
Merge branch 'master' of https://github.com/springlee/MyShared.git

Conflicts:
	My_Git/src/com/mvs/util/DbUtil.java