kongdefei:完成支付流程
Merge branch 'refs/heads' of https://github.com/TuanFou/TuanFou.git

Conflicts:
	src/com/tuanfou/test/UserDaoTest.java