Merge pull request #55 from CyanogenMod/cm-11.0

Cm 11.0
Merge pull request #56 from CyanogenMod/cm-11.0

PrivacyGuard: confirm permissions reset
Loscreen: see through / blur (2/2)
Merge branch 'cm-11.0' of https://github.com/CyanFox/android_packages_apps_Settings into HEAD

Conflicts:
	res/values/cm_strings.xml

Change-Id: I277400a2f052427401e1d462a7d326cc6d6da247