all use iphone resources
Merge remote-tracking branch 'origin/master'
en / cn resources