Updating ATI contect e-mails as per BH Ticket no. 628
Resyncing upstream and origin
Merge pull request #6 from thriuin/master

Updating ATI contect e-mails as per BH Ticket no. 628