bug fix
Merge branch 'refs/heads/kontem'

Conflicts:
	aijianmei_back/apps/index/Tpl/default/Index/daily.html
	aijianmei_back/apps/index/Tpl/default/Public/js/public.js