Added the navigation in the bottom of shop.
Merge branch 'refs/heads/master' into kontem
Merge remote-tracking branch 'refs/remotes/origin/master'
Added slider.
bug fix
Merge branch 'refs/heads/kontem'
Merge remote-tracking branch 'refs/remotes/origin/master'

Conflicts:
	aijianmei_back/apps/index/Tpl/default/Append/index.html
	aijianmei_back/apps/index/Tpl/default/Index/detail.html
	aijianmei_back/apps/index/Tpl/default/Nutri/index.html
Merge branch 'refs/heads/master' into kontem
safas
Merge remote-tracking branch 'refs/remotes/origin/master'
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'
视频分页相关