锻炼 天天计划评论块
Merge branch 'refs/heads/kontem'
Merge remote-tracking branch 'refs/remotes/origin/master'
fix bug
Merge branch 'refs/heads/kontem'
fix recommends nums top
correct the sider logic
Merge branch 'refs/heads/master' into BB

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