Merge branch 'develop' into feature-email
Added template and getting settings from config to Mail