making a copy online
Merge remote-tracking branch 'origin/master' into chris

Conflicts:
	res/values/strings.xml
Merged in chris's branch