Merge branch 'develop'
add tencent qq oauth2 login
Merge branch 'master' into develop