Settings: Lockscreen Colors and Lock Image [2/2]

Credit to Slim

Change-Id: I98319639ee1ed02e4dd48ffa54e88c212993b2d8

Conflicts:
	res/values/arrays.xml
	res/values/strings.xml
	res/xml/lockscreen_general.xml
	src/com/oct/tentacles/SettingsActivity.java