天天锻炼
更新天天锻炼
删除用手机上微博
错误提示页面底部更新
Merge branch 'refs/heads/kontem'
Merge remote-tracking branch 'refs/remotes/origin/master'

Conflicts:
	aijianmei_back/apps/index/Tpl/default/Index/daily.html
Merge branch 'refs/heads/kontem'
fix bug
Merge branch 'refs/heads/master' into kontem