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

Conflicts:
	Application/Runtime/Logs/Home/14_12_30.log
	Discuz/upload/data/diy/template/default/portal/index.htm
	Discuz/upload/data/template/1_1_common_header_forum_index.tpl.php
	Discuz/upload/data/template/1_1_common_header_forum_viewthread.tpl.php
	Discuz/upload/data/template/1_1_common_header_portal_index.tpl.php
	Discuz/upload/data/template/1_diy_forum_viewthread.tpl.php
	Discuz/upload/data/template/1_diy_portal_index.tpl.php
	Discuz/upload/data/template/1_levpop_lev.tpl.php
cvxc