Option to change number of QS columns - 2/2

Change-Id: I044ded7197d0304843b8d08b339ef50669ae2611

Conflicts:
	res/values/cm_arrays.xml
	res/xml/quick_settings_panel.xml
	src/com/android/settings/cyanogenmod/QuickSettings.java
Lock Screen - Option to hide initial page hints (2/2)
Change-Id: I6185a6a19b75da5f8d87ef4d9ca6b1d8b3fdbb67