kdf:note
Merge branch 'master' of https://github.com/TuanFou/TuanFou.git
HCZ：添加 新用户注册和用户登陆 2014/07/05
Merge branch 'master' 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