Quick Unlock (2/2)

Conflicts:
	res/values-de/sima_strings.xml
	res/values/sima_strings.xml