Merge branch 'hotfix/fixCateLogin'
fix test samsung api
Merge branch 'hotfix/1.5.2' into develop