Move CAF strings

Change-Id: Iab6288057e987cac866f6716761254e0329dd660

Conflicts:
	res/values/cm_strings.xml

(cherry picked from commit 7ba09098c4beac18ec6e560819783f5f99e3ef30)
Settings: make unaccounted and over-counted battery usage configurable

Google disabled it for release builds here:

https://github.com/SlimRoms/packages_apps_Settings/commit/e6793771cedb47aed72f1c64f870b70357746938

well but it is enabled for whatever other type of builds beside the official release builds. That said it should
be a developer option so or so and not build type dependent.

Whatever added an option into developer settings to control it. Default value is false.

That said.....finally no complain about misc battery stat in battery settings xD

Change-Id: I7549b1c796d5d9413b4af5d80a31d6efeaf0352a
(cherry picked from commit ec25314f9d6df5a6b94559395bda08648e0870dd)
Settings: Do not remove quicksettings features on tablets

Old code which were needed to do not conflict with split QS/Notification drawer
on kitkat

just remove the check for it.

Change-Id: I18cd9bf66e10d48f59c9d152129cbf3b1fc074dd
(cherry picked from commit 06624f81faecfe2eb366efe4a81ed9e2204835c7)

Conflicts:
	src/com/android/settings/cyanogenmod/StatusBarSettings.java
Weather disabled by default

(cherry picked from commit 2ef48a1c05233bff7094e7bd3bd853e0ef792d0c)

Conflicts:
	res/xml/status_bar_settings.xml