Revert "Option to change number of QS columns - 2/2"

This reverts commit a83d4a228bda346fb44d5c9d8fa6a13c6c3bb55f.
Extended QS style options (2/2)

This is implemenation is based on: https://github.com/SlimRoms/packages_apps_Settings/commit/8d3a8c9a5d9f86a885b39c608d22d77e9e545232
Thanks to kufikugel!

Change-Id: I43a51672cbb8edb2b68680a45f1bc9f65526f1d2

Conflicts:

	AndroidManifest.xml
	res/values/cm_arrays.xml
	res/values/cm_strings.xml