Checkpoint
Merge remote-tracking branch 'origin/master' into socialcoffee

* origin/master:
  Adding emails about rozalindas
Edit/Delete comments for master