B1.8 Build 2
Merge remote-tracking branch 'origin/master'

Conflicts:
	res/values-sk/strings.xml