Back to KitStalk

Conflicts:
	res/values/bs_strings.xml