Merge branch 'master.go' of https://github.com/gerhardol/Sfen into gerhardol-master.go

Conflicts fixed:
	app/src/main/res/values/strings.xml
Merge branch 'master.go' of https://github.com/gerhardol/Sfen into gerhardol-master.go

Conflicts fixed:
	app/src/main/res/values/strings.xml
Merge branch 'gerhardol-master.go'
Merge branch 'master' into master.go

Conflicts:
	app/src/main/res/values/strings.xml