Merge branch 'hotfix/merchandise_bug'
Fixed email address
Merge branch 'hotfix/Fix_email_address' into develop