Merge "Lockscreen targets: more unification" into cm-10.2
Conflicts:
	src/com/android/settings/cyanogenmod/LockscreenTargets.java

Change-Id: Icbc9ebddd30b2060cfcc1b17a23d6b24d5486ad6