Merge commit.
Merge remote-tracking branch 'origin/cjk-development' into
cjk-development

Conflicts:
	Purple Robot Manager/res/values/strings.xml