Merge branch 'refs/heads/master' into kontem
bug fix
bug fix 编码恢复
Merge branch 'refs/heads/master' into kontem

Conflicts:
	aijianmei_back/apps/index/Tpl/default/Nutri/index.html
fix
Merge branch 'refs/heads/kontem'