remove http from the site domain in activation email.
Merge remote-tracking branch 'origin/master'