c
Merge branch 'master' of https://github.com/chenxiqingniao/gxaccpoa.git

Conflicts:
	GitTest/src/com/gxaccp/test/Client.java