disabled email notifications and tests, added test to ensure sad path works for users update
fixed failing test
Merge pull request #301 from yggie/fixes

Emergency fixes
Merge pull request #302 from AgileVentures/develop

Deploying to Staging
Merge branch 'staging' of https://github.com/AgileVentures/WebsiteOne into staging
Revert Emergency Fixes
Merge pull request #304 from sampritipanda/fixes

Revert Emergency Fixes
Merge pull request #305 from AgileVentures/develop

Pushing fix revert to Staging
Merge branch 'staging' of https://github.com/AgileVentures/WebsiteOne into staging