Merge branch 'master' into design_merge
Merge branch 'master' into design_merge
Add email heart asset
Merge branch 'design_merge'