APi document updated
conflict fixed
cate list
Merge branch 'dev' of github.com:VectorWinner/takeaway into dev