edit update profile
choose app language
Merge remote-tracking branch 'origin/master'
merge with huy