'kerentai'
Merge branch 'master' of https://github.com/rabbitgo/work into kerentai
js 重构  滚动条跳动。
'rer'
resolve conflict, adjust css file to make category float left
min-height
Merge branch 'master' of https://github.com/rabbitgo/work
Merge branch 'master' of http://github.com/rabbitgo/work into rebuild
各种BUG。

各种BUG。
Merge branch 'master' of http://github.com/rabbitgo/work into rebuild
delete deprecated file
adjust server
modify db.sql article