'Quicktile row option:set 3,4,5 tiles per row (1/2)'

Conflicts:

	AndroidManifest.xml
	res/values/arrays.xml
	res/values/strings.xml