Merge branch 'master' into dev
invitation mail link
Merge branch 'dev'