branch
change words
change team words
change team words
Merge branch 'bug-fix-a001' of https://github.com/willyou/infopower
fixed conficts