Fixes

Conflicts:

	res/values/arrays.xml
	res/values/strings.xml
	res/xml/navbaroptions.xml