Merge "Settings: remove lockscreen wallpaper picker from Lockscreen Interface" into cm-11.0
(cherry picked from commit 0c438ed66db09119c8f6dc37441a974472568f49)
Merge "Settings: move 'Take bug report' from Dev to About" into cm-11.0
(cherry picked from commit 5e4982fab03ae6e3232e30be6bc285f3e5b85b3f)
Merge remote-tracking branch 'github/cm-11.0' into HEAD

(cherry picked from commit 26f8891e7862159d9d019bbaffe17f8514b3084a)

Conflicts:
	res/values/cm_strings.xml
	res/xml/device_info_settings.xml
	src/com/android/settings/bluetooth/BluetoothSettings.java