update develop
dont use ip to check language
Merge branch 'develop' into feature/thaiinhk