Merge branch 'master' into avatar
Merge branch 'avatar' of https://github.com/Wei-Lu/book_show into avatar