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 remote-tracking branch 'cm/cm-11.0' into HEAD

Conflicts:
	res/xml/lockscreen_interface_settings.xml
	src/com/android/settings/cyanogenmod/LockscreenInterface.java

Change-Id: I56e559b43696f862d6af9cbb73c863425625bb5f