Merge branch 'dev' into ui
Merge branch 'dev' into ui
add join js
add join js
add share tips
add leave
fix conflict
Merge remote-tracking branch 'origin/ui' into dev