String
Merge branch 'master' of https://github.com/tienbrowan/test

Conflicts:
	TeamBGitTester/res/values/strings.xml