Fold name from manager ->mgr
1. Merge ZXD's code
Merge branch 'master' of https://github.com/cobble19/takeaway.git
Merge branch 'master' of https://github.com/cobble19/takeaway.git