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

Conflicts:
	aijianmei_back/apps/index/Tpl/default/Nutri/index.html