Merge branch 'master' of https://github.com/liuwanwei/tang

Conflicts:
	protected/views/comment/_view.php
你页脚显示出来了
Merge pull request #79 from liangxiaobo/master

页脚显示