update xml files (general, greeting, name etc)
Merge branch 'branch1'