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

Conflicts:
	OSC/res/values/strings.xml