...
Merge remote-tracking branch 'origin/jb2' into jb2

Conflicts:
	res/values-ru/strings.xml
...