Changed "notes" in error message to "teams"
Merge remote-tracking branch 'origin/master'

Conflicts:
	code/res/values/strings.xml