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

Conflicts:
	Application/Runtime/Logs/Home/14_12_23.log
	Application/Runtime/Logs/Home/14_12_24.log
	Discuz/upload/data/cache/style_1_common.css
	Discuz/upload/data/cache/style_1_forum_index.css
	Discuz/upload/data/cache/style_1_home_spacecp.css
	Discuz/upload/data/cache/style_1_module.css
	Discuz/upload/data/log/201412_cplog.php
	Discuz/upload/data/log/201412_errorlog.php
	Discuz/upload/data/template/1_1_common_header_forum_forumdisplay.tpl.php
	Discuz/upload/data/template/1_1_common_header_forum_index.tpl.php
	Discuz/upload/data/template/1_1_common_header_home_magic.tpl.php
	Discuz/upload/data/template/1_1_common_header_home_spacecp.tpl.php
	Discuz/upload/data/template/1_1_common_header_member_logging.tpl.php
	Discuz/upload/data/template/1_1_common_header_misc_faq.tpl.php
	Discuz/upload/data/template/1_1_forum_discuzcode.tpl.php
	Discuz/upload/data/template/1_1_forum_forumdisplay_fastpost.tpl.php
	Discuz/upload/data/template/1_1_member_login.tpl.php
	Discuz/upload/data/template/1_diy_forum_forumdisplay.tpl.php
	Discuz/upload/data/template/1_qqconnect_module.tpl.php
	Discuz/upload/data/template/1_wechat_module.tpl.php
ad
Merge branch 'master' of https://github.com/zhaolun/mybbs

Conflicts:
	Discuz/upload/data/log/201412_cplog.php
	Discuz/upload/data/template/1_1_common_header_home_spacecp.tpl.php
	Discuz/upload/data/template/1_diy_forum_discuz.tpl.php
	Discuz/upload/forum.php
	Discuz/upload/source/module/misc/misc_faq.php
	Discuz/upload/template/default/forum/discuz.htm
	Discuz/upload/userapp.php
Merge branch 'master' of https://github.com/zhaolun/mybbs

Conflicts:
	Application/Runtime/Logs/Home/14_12_24.log
	Discuz/upload/group.php