Merge branch 'refs/heads/kontem'
Merge branch 'refs/heads/kontem'
fix few words
fix words
set the default pager class
delete 'the meaning of training' frame
Merge branch 'refs/heads/BB'

Conflicts:
	aijianmei_back/apps/index/Tpl/default/Nutri/index.html
	aijianmei_back/apps/index/Tpl/default/Train/index.html
	aijianmei_back/apps/index/Tpl/default/Train/list.html
update html page
delete some frame
Merge branch 'refs/heads/BB'

Conflicts:
	aijianmei_back/apps/index/Tpl/default/Append/index.html
	aijianmei_back/apps/index/Tpl/default/Nutri/index.html
fix
update some words
Merge branch 'refs/heads/BB'

Conflicts:
	aijianmei_back/apps/index/Tpl/default/Append/index.html
	aijianmei_back/apps/index/Tpl/default/Nutri/index.html
update js and fix  'go to top' button
Merge branch 'refs/heads/kontem'
Merge branch 'refs/heads/BB'

Conflicts:
	aijianmei_back/apps/index/Tpl/default/Public/js/article.js
	aijianmei_back/apps/index/Tpl/default/Public/js/public.js
make some mistake , head to version
Merge remote-tracking branch 'refs/remotes/origin/master'
Merge branch 'refs/heads/kontem'
fix recommends nums top