Merge remote-tracking branch 'upstream/user' into user
Merge remote-tracking branch 'upstream/user' into user
Change nav
Merge pull request #620 from liuchuangww/user

User