Adding SMS and telephone
Merge branch 'mail_schema' into dev