kongdefei:提交登录注册
Signed-off-by: KDF5000 <kdf5000@163.com>
Merge branch 'refs/heads' of https://github.com/TuanFou/TuanFou.git
kongdefei:提交登录注册
Merge branch 'refs/heads' of https://github.com/TuanFou/TuanFou.git

Conflicts:
	src/com/tuanfou/action/UserAction.java
	src/com/tuanfou/service/UserService.java
	src/com/tuanfou/test/UserDaoTest.java