媒体主bug修复
配置，不要上传
Merge branch 'master' of github.com:cyndiWade/chengwai

Conflicts:
	App/Lib/Action/Index/FaqAction.class.php
	App/Lib/Action/Index_bak/IndexAction.class.php
	App/Lib/Action/Index_bak/IndexBaseAction.class.php
	App/Public/Index/news_skin/cwq_about.css
	App/Public/Index/news_skin/cwq_index.css
	App/Public/Index/news_skin/cwq_loginreg.css
	App/Public/Index/news_skin/cwq_mod.css
	App/Public/Index/news_skin/cwq_news.css
	App/Public/Index/news_skin/cwq_style.css
	App/Public/Index/news_skin/cwq_weibo.css
	App/Public/Index/news_skin/images/spokeimg/pic_scroll.js
	App/Public/Index/news_skin/js/banner_jquery.js
	App/Public/Index/news_skin/js/casejs.js
	App/Public/Index/news_skin/js/contact_js.js
	App/Public/Index/news_skin/js/cwq_bottom.js
	App/Public/Index/news_skin/js/ie6png.js
	App/Public/Index/news_skin/js/info.js
	App/Public/Index/news_skin/js/newcwq_menu.js
	App/Public/Index/news_skin/meber_style/cwq_member.js
	App/Public/Index/news_skin/meber_style/member_index.css
	App/Public/Index/news_skin/meber_style/member_style.css
	App/Public/Index/news_skin/weixin_style.css
	App/Public/Index_bak/js/about.js
	App/Public/Index_bak/js/compr.js
	App/Public/Index_bak/js/counts.js
	App/Public/Index_bak/js/cwq_qq.js
	App/Public/Index_bak/js/html5.js
	App/Public/Index_bak/js/jquery.min.js
	App/Public/Index_bak/js/phone.js
	App/Public/Index_bak/js/pic_scroll.js
	App/Public/Index_bak/js/slider_jquery.js
	App/Tpl/Index/Faq/1.html
	App/Tpl/Index/Faq/122.html
	App/Tpl/Index/Faq/2.html
	App/Tpl/Index/Faq/3.html
	App/Tpl/Index/Faq/4.html
	App/Tpl/Index/Faq/5.html
	App/Tpl/Index/Faq/6.html
	App/Tpl/Index/Faq/7.html
	App/Tpl/Index/Faq/7_1.html
	App/Tpl/Index/Faq/8.html
	App/Tpl/Index/Faq/index.html
	App/Tpl/Index/Index/index.html
	App/Tpl/Index/Index/locate.html
	App/Tpl/Index/Index/services.html
	App/Tpl/Index/Index/vip.html
	App/Tpl/Index/Public/bottom.html
	App/Tpl/Index/Public/footer.html
	App/Tpl/Index/Public/login_form.html
	App/Tpl/Index/Public/top.html
	App/Tpl/Index_bak/Index/about_us.html
	App/Tpl/Index_bak/Index/contact.html
	App/Tpl/Index_bak/Index/index.html
	App/Tpl/Index_bak/Index/kh_case.html
	App/Tpl/Index_bak/Index/news.html
	App/Tpl/Index_bak/Index/wechat.html
	App/Tpl/Index_bak/Index/weibo.html
	App/Tpl/Index_bak/Public/bottom.html
	App/Tpl/Index_bak/Public/footer.html
	App/Tpl/Index_bak/Public/header.html
	App/Tpl/Index_bak/Public/sidebar.html
	App/Tpl/Index_bak/Public/top.html
	news_skin/cwq_about.css
	news_skin/cwq_index.css
	news_skin/cwq_loginreg.css
	news_skin/cwq_mod.css
	news_skin/cwq_news.css
	news_skin/cwq_style.css
	news_skin/cwq_weibo.css
	news_skin/images/spokeimg/pic_scroll.js
	news_skin/js/about.js
	news_skin/js/banner_jquery.js
	news_skin/js/casejs.js
	news_skin/js/compr.js
	news_skin/js/contact_js.js
	news_skin/js/counts.js
	news_skin/js/cwq_bottom.js
	news_skin/js/cwq_qq.js
	news_skin/js/html5.js
	news_skin/js/ie6png.js
	news_skin/js/info.js
	news_skin/js/jquery.min.js
	news_skin/js/newcwq_menu.js
	news_skin/js/phone.js
	news_skin/js/pic_scroll.js
	news_skin/js/slider_jquery.js
	news_skin/meber_style/cwq_member.js
	news_skin/meber_style/member_index.css
	news_skin/meber_style/member_style.css
	news_skin/weixin_style.css