OpenDelta :)
Conflicts:
	res/values/strings.xml