manager
Merge branch 'master' of github.com:channingbreeze/xinxinweb