Merge invitation feature into master