mail fix
Merge branch 'dev'
hero page change