App sidebar (2/2)

Change-Id: I9aae5e80960e5037e7aa69019004d4dda91f282a

Conflicts:
	res/values/attrs.xml
	res/values/cm_arrays.xml
	res/values/cm_strings.xml
	res/xml/system_settings.xml