Added new email settings
Merge branch 'staging' of github.com:SNGTRKR/sngtrkr into staging