editing info action and it's page, unfinished, commit for save
BB
Merge branch 'refs/heads/master' into BB
Changed style
fix the footer div
hearder
delete a action and some view page about it
delete a 'f' at the begining
delete some redundancy
Merge branch 'refs/heads/BB'
Changed style of index.
Merge remote-tracking branch 'refs/remotes/origin/Annbranch'
Changed the picture in training page.
fix link
Merge branch 'refs/heads/BB'
Merge remote-tracking branch 'refs/remotes/origin/master'
修改了锻炼，营养页面的翻页块，，，修改了补充1的文章列表排版
修改了锻炼页面1视频的提示块
修复缓存BUG
update back css and js files