finish the list part
列表页和内容页
solve conflict
Merge branch 'develop' of github.com:vtmer/freshman into develop