remove trailing spaces
update mail subjects in branch and tag mails
Fix typo in joined to team mail
Update user subscriptions
Merge branch 'feature/notifications' into new_staging

* feature/notifications:
  Update user subscriptions
  Fix typo in joined to team mail
  update mail subjects in branch and tag mails
  remove trailing spaces