Merge branch 'master' into better-emails

util/useremails.py

@@ -6,7 +6,7 @@ from data import model
 from util.gravatar import compute_hash
 
 def user_reference(username):
-  user = model.get_user(username)
+  user = model.get_user_or_org(username)
   if not user:
     return username
 
@@ -123,6 +123,14 @@ def send_payment_failed(email, username):
     'username': username
   })
 
+def send_org_invite_email(member_name, member_email, orgname, team, adder, code):
+  send_email(member_email, 'Invitation to join team', 'teaminvite', {
+    'inviter': adder,
+    'token': code,
+    'organization': orgname,
+    'teamname': team
+  })
+
 
 def send_invoice_email(email, contents):
   # Note: This completely generates the contents of the email, so we don't use the