fixed email error
debugging
revert
Merge branch 'develop' into staging
still debugging
Merge branch 'develop' into staging
fixing listening
Merge branch 'develop' into staging
possible fix to app crashes
Merge branch 'develop' into staging
Merge branch 'staging'