Make the lock screen camera widget configurable (2/2)

Change-Id: I704ddeb4a1b8ba4537d961334138b6661f8dbc31
Merge "Make the lock screen camera widget configurable (2/2)" into cm-11.0
Merge branch 'cm-11.0' of https://github.com/CyanogenMod/android_packages_apps_Settings into CyanogenMod-cm-11.0

Conflicts:
	src/com/android/settings/cyanogenmod/LockscreenInterface.java

	modified:   res/values/cm_strings.xml
	modified:   res/xml/lockscreen_interface_settings.xml
	modified:   src/com/android/settings/cyanogenmod/LockscreenInterface.java