Merge branch 'master' of github.com:xxcode/grit_client
Merge branch 'master' of github.com:xxcode/grit_client