Fix invite a friend template
Merge branch 'master' into live