[SGF] stage 1
[SGF] stage 1

Merge remote-tracking branch 'origin/master'

Conflicts:
	res/values/strings.xml