first ui
Second change
End UI
Merge branch 'UI' into Code

Conflicts:
	res/values/strings.xml