first commit.
2
3
f
a
Merge branch 'master' of https://github.com/liaogang/updateLocalizedString

Conflicts:
	.gitignore