Solve small error with invite popover
Ingore main.j
Also ignore vendor
Fix typo
Merge branch 'master' into file_attach