Manager UI Start
Merge branch 'gerard'

Conflicts:
	res/values/strings.xml