Dylan's commit on new self branch.
Merge branch 'Dylan'

Conflicts:
	res/values/strings.xml