几个test类的完成
may be wrong
Merge branch 'master' of git@github.com:TuanFou/TuanFou.git

Conflicts:
	src/com/tuanfou/test/AccountDaoTest.java
	src/com/tuanfou/test/AreaDaoTest.java
Merge branch 'master' of git@github.com:TuanFou/TuanFou.git