added tips
Merge remote-tracking branch 'origin/testInvite' into testInvite
final