test de branches mbp
Merge remote-tracking branch 'origin/mbp-locale' into imac27-locale

Conflicts:
	Android/HelloAndroidworldGit/res/values/strings.xml