strings.xml updated
Merge remote branch 'upstream/master'