Add (unused) invites list to u_chan and u_user
Merge remote-tracking branch 'upstream/master'