update emails, dashboard and other
Merge remote-tracking branch 'origin/master'