create x2 friendship bug fixed.
Merge branch 'dev'