c1
Merge remote-tracking branch 'origin/amend_last_commit' into amend_last_commit

Conflicts:
	res/values/strings.xml