App sidebar [2/2]

Change-Id: Ie851115dbf3fd0c51ea360e6570e9ccb64d73329

Conflicts:
	res/values/arrays.xml
	res/values/strings.xml