App sidebar [2/2]

Conflicts:

	AndroidManifest.xml
	res/values/cm_arrays.xml
	res/values/cm_strings.xml
	res/xml/system_settings.xml