sadv
Merge branch 'master' of https://github.com/zhaolun/mybbs
sfbn
Merge branch 'master' of https://github.com/zhaolun/mybbs

Conflicts:
	Discuz/upload/data/template/1_1_common_header_forum_index.tpl.php
	Discuz/upload/data/template/1_diy_forum_discuz.tpl.php