Merge branch 'refs/heads/master' into kontem
添加了每日更新的图片
bug fix
login from main site
bug fix 编码恢复
fix
Merge branch 'refs/heads/master' into kontem

Conflicts:
	aijianmei_back/apps/index/Tpl/default/Nutri/index.html
fix
Merge branch 'refs/heads/kontem'
fix
Merge branch 'refs/heads/kontem'
视频分页相关
Merge branch 'refs/heads/master' into kontem
添加了每日更新的图片
修改了视频页面v.html
导航高亮
Merge branch 'refs/heads/kontem'
从主站登录商城更新
登录更新
fix