阿萨德发射点发斯蒂芬
Merge branch 'refs/heads/master' into MianBranch

Conflicts:
	aijianmei_back/shop/data/config.php
	aijianmei_back/shop/temp/caches/f/index_40F756F0.php
	aijianmei_back/shop/temp/compiled/group_buy.lbi.php
	aijianmei_back/shop/temp/compiled/index.dwt.php
	aijianmei_back/shop/temp/compiled/page_header.lbi.php
	aijianmei_back/shop/temp/query_caches/sqlcache_config_file_445f2c63abbbcf2e230719f8a9f2a19e.php
	aijianmei_back/shop/temp/static_caches/cat_pid_releate.php
	aijianmei_back/shop/temp/static_caches/recommend_goods.php
	aijianmei_back/shop/temp/static_caches/shop_config.php
git  ignore added the ignore file which is aijianmei_web/shop/temp/*
article.html add btn_back
替换首页最新文章板块
i（mian）add new parts of new article and new video for index.html
for index.html sharing weibo change opacity