Merge branches 'master' and 'staging' into develop
fixed merge issue
Merge branch 'develop' into staging