Settings: Disable Battery status preference on ModLock.

Change-Id: I9c1b978cd3c50b6db73b333b9e392ee1918a9499
Settings: Allow All Widgets On Keyguard (2/2)

Another user request with zero device impact
	for daily usage, so I went ahead and
	did it.

Change-Id: Ic87099be744255309674ca855a9376c715903781

Conflicts:
	res/values/slim_strings.xml
	res/xml/lockscreen_widgets.xml
	src/com/android/settings/slim/LockscreenWidgets.java
Fix errors in build by Allow All Widgets On Keyguard
Merge branch 'cm-11.0' of https://github.com/CyanogenMod/android_packages_apps_Settings into android-4.4