kongdeefi:商家登录
Merge branch 'refs/heads' of https://github.com/TuanFou/TuanFou.git

Conflicts:
	src/com/tuanfou/action/MerchantAction.java