Sync local changes...

Upsi, I should do this more often....
Merge remote-tracking branch 'origin/master'

Conflicts:
	res/values-sk/strings.xml