ln:1.商家获得管理员发送的消息  2.商家修改密码
Merge branch 'refs/heads' of https://github.com/TuanFou/TuanFou.git

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