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

Conflicts:
	Application/Runtime/Cache/Home/6315a3b60704959f9f99b5b720e4544a.php
	Application/Runtime/Cache/Home/8ed741b6da9e3cf0b06484dfb6809ef8.php
	Application/Runtime/Cache/Home/9dda77d2e24c3b861068a56d09d97ad5.php
	Application/Runtime/Logs/Home/14_12_30.log
	Discuz/upload/data/addonmd5/levpop.plugin.xml
	Discuz/upload/data/addonmd5/tyx_blackjack.plugin.xml
	Discuz/upload/data/diy/template/default/forum/discuz.htm
	Discuz/upload/data/diy/template/default/portal/index.htm
	Discuz/upload/data/diy/template/default/portal/index.htm.bak
	Discuz/upload/data/log/201412_cplog.php
	Discuz/upload/data/log/201412_errorlog.php
	Discuz/upload/data/template/1_1_common_header_forum_index.tpl.php
	Discuz/upload/data/template/1_1_common_header_forum_post.tpl.php
	Discuz/upload/data/template/1_1_common_header_forum_viewthread.tpl.php
	Discuz/upload/data/template/1_1_common_header_home_space.tpl.php
	Discuz/upload/data/template/1_1_common_header_member_logging.tpl.php
	Discuz/upload/data/template/1_1_common_header_member_register.tpl.php
	Discuz/upload/data/template/1_1_common_header_misc_faq.tpl.php
	Discuz/upload/data/template/1_1_common_header_portal_index.tpl.php
	Discuz/upload/data/template/1_1_forum_post.tpl.php
	Discuz/upload/data/template/1_1_member_login.tpl.php
	Discuz/upload/data/template/1_1_member_register.tpl.php
	Discuz/upload/data/template/1_1_portal_portalcp_block.tpl.php
	Discuz/upload/data/template/1_1_search_forum.tpl.php
	Discuz/upload/data/template/1_diy_forum_discuz.tpl.php
	Discuz/upload/data/template/1_diy_forum_viewthread.tpl.php
	Discuz/upload/data/template/1_diy_home_space_notice.tpl.php
	Discuz/upload/data/template/1_diy_portal_index.tpl.php
	Discuz/upload/data/template/1_levpop_js.tpl.php
	Discuz/upload/data/template/1_tyx_blackjack_index.tpl.php
	Discuz/upload/source/plugin/levpop/admin.inc.php
	Discuz/upload/source/plugin/levpop/admin2.inc.php
	Discuz/upload/source/plugin/levpop/admin3.inc.php
	Discuz/upload/source/plugin/levpop/lev_base.php
	Discuz/upload/source/plugin/levpop/lev_class.php
	Discuz/upload/source/plugin/levpop/lev_enter.php
	Discuz/upload/source/plugin/levpop/lev_module.php
	Discuz/upload/source/plugin/levpop/levpop.inc.php
	Discuz/upload/source/plugin/levpop/statics/css/css.css
	Discuz/upload/source/plugin/levpop/statics/dialog417/plugins/iframeTools.source.js
	Discuz/upload/source/plugin/levpop/statics/dialog417/skins/aero.css
	Discuz/upload/source/plugin/levpop/statics/dialog417/skins/black.css
	Discuz/upload/source/plugin/levpop/statics/dialog417/skins/blue.css
	Discuz/upload/source/plugin/levpop/statics/dialog417/skins/chrome.css
	Discuz/upload/source/plugin/levpop/statics/dialog417/skins/default.css
	Discuz/upload/source/plugin/levpop/statics/dialog417/skins/green.css
	Discuz/upload/source/plugin/levpop/statics/dialog417/skins/idialog.css
	Discuz/upload/source/plugin/levpop/statics/dialog417/skins/opera.css
	Discuz/upload/source/plugin/levpop/statics/dialog417/skins/phpcms.css
	Discuz/upload/source/plugin/levpop/statics/dialog417/skins/simple.css
	Discuz/upload/source/plugin/levpop/statics/dialog417/skins/twitter.css
	Discuz/upload/source/plugin/levpop/statics/img/slotmachine.js
	Discuz/upload/source/plugin/levpop/statics/img/slotpop.css
	Discuz/upload/source/plugin/levpop/template/js.htm
	Discuz/upload/source/plugin/levpop/template/lev.htm
	Discuz/upload/source/plugin/tyx_blackjack/index.inc.php
	Discuz/upload/source/plugin/tyx_blackjack/template/images/app.min.js
	Discuz/upload/source/plugin/tyx_blackjack/template/index.htm
	Discuz/upload/source/plugin/tyx_blackjack/template/mobile/index.htm
	Discuz/upload/uc_client/data/cache/badwords.php