Merge branch 'hotfix_add_logo' into develop
fix discounts
Merge branch 'develop'