Merge remote-tracking branch 'cm/cm-11.0' into HEAD

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

Change-Id: I9bb137abd680bb715d871a35028b838b78fa4ebc