fix default colors for janice

this commit fix this incompatible commit from cm: http://review.cyanogenmod.org/#/c/59752/
Revert "Lockscreen background style 2 of 2"

This reverts commit 0650ab27a2202c29563048954d5fa862d4da8bcd.

Conflicts:
	res/values/resurrection_arrays.xml
	res/values/resurrection_strings.xml
	res/xml/lockscreen_settings.xml
Revert "update lockscreen background fix settings crash"

This reverts commit 59436d9dcba042190344009a3fb7bfccb73eeb16.

Conflicts:
	res/values/resurrection_arrays.xml
	res/values/resurrection_strings.xml
	res/xml/lockscreen_interface_settings.xml
	res/xml/lockscreen_settings.xml
	src/com/android/settings/cyanogenmod/LockscreenInterface.java
Settings: Lockscreen custom wallpaper (2/2)

Change-Id: I1ac1351e9a31a5827847e30113e933f2b7da219f

Conflicts:
	src/com/android/settings/cyanogenmod/LockscreenInterface.java
Settings: move keyguard wallpaper to system (2/2)

Change-Id: Id3bb66aa78c2e3dbd1170e74e33fcd160e5a70bb
Signed-off-by: Roman Birg <roman@cyngn.com>

Conflicts:
	res/xml/theme_settings.xml
	src/com/android/settings/cyanogenmod/LockscreenInterface.java
Add wallpaper pickers to seperate package [2/2]

Change-Id: I233b90aa52b5a8c408fa3adfe3bdad07330cc2ad