email fix
Merge branch 'master' into pinauthintegration
Merge pull request #206 from apatel/pinauthintegration

Pinauthintegration