Lockscreen shortcuts

Conflicts:
	AndroidManifest.xml
	res/values/ras_arrays.xml
	res/values/ras_strings.xml
	res/xml/system_settings.xml

Conflicts:
	AndroidManifest.xml
	res/values-es/ras_strings.xml
	res/values/ras_arrays.xml
	res/values/ras_strings.xml
	res/xml/system_settings.xml