ln：profile.html,没写好,可以删掉
ln：发表评论、支付订单
Merge branch 'master' of https://github.com/TuanFou/TuanFou.git

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