updating safari
Merge branch 'shengzhc' into dev