Added picture.
视频详细页面bug fix
qq 登陆api 接入
shop 同步登录登出
fix
删除掉首页翻页，，，改了天天锻炼子页面
改变顶部的z-index
Merge remote-tracking branch 'refs/remotes/origin/MianBranch'

Conflicts:
	aijianmei_back/apps/index/Tpl/default/Public/css/public.css
	aijianmei_back/apps/index/Tpl/default/Public/js/public.js
Merge remote-tracking branch 'refs/remotes/origin/MianBranch'

Conflicts:
	aijianmei_back/apps/index/Tpl/default/Public/css/public.css
change index.html
Merge remote-tracking branch 'refs/remotes/origin/MianBranch'
fix
fix www同步相关文件
fix
load back
fix
bug fix
fix bug
update the function about footer manage
add a template for footer
fix the function about footer manage
分享fix