Mail support fixed. Push notifications log fixed.
Merge pull request #154 from kmabey/LocalDev

Mail support fixed. Push notifications log fixed.
Merge pull request #155 from kmabey/dev

Dev
Merge pull request #156 from kmabey/qa

Qa