updated settings
added localsettings
fixed signal email
Merge branch 'master' into preview