My bad
Fix Remix Settings crash

The fragments was incorrectly labeled
Settings : Port lockscreen shortcut configuration

Port lockscreen configuration from cm-10.2

Change-Id: Ib4fd41f747912cc741eca1983c5f56df56176aad

Conflicts:
	AndroidManifest.xml
	res/values/cm_arrays.xml
	res/values/cm_strings.xml
	res/values/dimens.xml
	res/xml/lockscreen_widgets.xml
	src/com/android/settings/cyanogenmod/LockscreenInterface.java
	src/com/android/settings/cyanogenmod/ShortcutPickHelper.java
Merge remote-tracking branch 'upstream/kitkat-remix' into kitkat-remix_ActiveDisplay